Merge branch 'for-3.2' into for-3.3
authorMark Brown <[email protected]>
Tue, 6 Dec 2011 10:09:55 +0000 (10:09 +0000)
committerMark Brown <[email protected]>
Tue, 6 Dec 2011 10:09:55 +0000 (10:09 +0000)

Trivial merge