Merge commit 'v2.6.33-rc2' into for-2.6.33
authorMark Brown <[email protected]>
Sat, 26 Dec 2009 14:52:54 +0000 (14:52 +0000)
committerMark Brown <[email protected]>
Sat, 26 Dec 2009 14:52:54 +0000 (14:52 +0000)

Trivial merge