Merge branch 'for-3.2' into for-3.3
authorMark Brown <[email protected]>
Mon, 5 Dec 2011 19:30:05 +0000 (19:30 +0000)
committerMark Brown <[email protected]>
Mon, 5 Dec 2011 19:30:05 +0000 (19:30 +0000)

Trivial merge