Merge branch 'v0.11.0-release'
authorisaacs <i@izs.me>
Thu, 28 Mar 2013 21:50:20 +0000 (14:50 -0700)
committerisaacs <i@izs.me>
Thu, 28 Mar 2013 21:50:20 +0000 (14:50 -0700)

Trivial merge