Merge
authorMichael Foord <michael@voidspace.org.uk>
Mon, 12 Mar 2012 20:54:03 +0000 (13:54 -0700)
committerMichael Foord <michael@voidspace.org.uk>
Mon, 12 Mar 2012 20:54:03 +0000 (13:54 -0700)

Trivial merge