Merge branch 'for-2.6.37' into HEAD
authorMark Brown <[email protected]>
Mon, 8 Nov 2010 16:52:02 +0000 (16:52 +0000)
committerMark Brown <[email protected]>
Mon, 8 Nov 2010 16:52:02 +0000 (16:52 +0000)

Trivial merge