Merge branch 'master' into hammer2
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 16 Feb 2012 16:11:58 +0000 (08:11 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 16 Feb 2012 16:11:58 +0000 (08:11 -0800)

Trivial merge