Merge branch 'v0.11.1-release'
authorisaacs <i@izs.me>
Fri, 19 Apr 2013 16:14:24 +0000 (09:14 -0700)
committerisaacs <i@izs.me>
Fri, 19 Apr 2013 16:14:24 +0000 (09:14 -0700)

Trivial merge