Merge commit 'v2.6.34-rc5' into oprofile/core
Robert Richter [Fri, 23 Apr 2010 12:30:22 +0000 (14:30 +0200)]

Trivial merge