Merge branch 'v0.9.6-release'
authorisaacs <i@izs.me>
Fri, 11 Jan 2013 19:25:37 +0000 (11:25 -0800)
committerisaacs <i@izs.me>
Fri, 11 Jan 2013 19:25:37 +0000 (11:25 -0800)

Trivial merge