Merge commit 'v2.6.27-rc6' into core/resources
Ingo Molnar [Sun, 14 Sep 2008 15:23:29 +0000 (17:23 +0200)]

Trivial merge