Merge branch 'master' of https://github.com/geophree/ninja
authorEvan Martin <martine@danga.com>
Tue, 8 Feb 2011 18:34:52 +0000 (10:34 -0800)
committerEvan Martin <martine@danga.com>
Tue, 8 Feb 2011 18:34:52 +0000 (10:34 -0800)

Trivial merge