Merge branch 'v0.9.11-release'
authorisaacs <i@izs.me>
Fri, 1 Mar 2013 19:19:20 +0000 (11:19 -0800)
committerisaacs <i@izs.me>
Fri, 1 Mar 2013 19:19:20 +0000 (11:19 -0800)

Trivial merge