Merge branch 'v0.9.4-release'
authorisaacs <i@izs.me>
Fri, 21 Dec 2012 20:36:04 +0000 (12:36 -0800)
committerisaacs <i@izs.me>
Fri, 21 Dec 2012 20:36:04 +0000 (12:36 -0800)

Trivial merge