Merge branch 'for-3.1' into for-3.2
authorMark Brown <[email protected]>
Thu, 6 Oct 2011 19:03:18 +0000 (20:03 +0100)
committerMark Brown <[email protected]>
Thu, 6 Oct 2011 19:03:18 +0000 (20:03 +0100)

Trivial merge