Merge branch 'v0.9.7-release'
authorisaacs <i@izs.me>
Fri, 18 Jan 2013 19:49:12 +0000 (11:49 -0800)
committerisaacs <i@izs.me>
Fri, 18 Jan 2013 19:49:12 +0000 (11:49 -0800)

Trivial merge