Merge branch 'v0.9.12-release'
authorisaacs <i@izs.me>
Wed, 6 Mar 2013 21:59:07 +0000 (13:59 -0800)
committerisaacs <i@izs.me>
Wed, 6 Mar 2013 21:59:07 +0000 (13:59 -0800)

Trivial merge