Merge commit '559fa6e76b27' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:15:43 +0000 (16:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:15:58 +0000 (16:15 +0200)
Merge reason: this commit was queued up quite some time ago but was
              forgotten about.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge