Merge branch 'master' of neugierig.org:projects/git/ninja
authorEvan Martin <martine@danga.com>
Thu, 3 Feb 2011 18:40:42 +0000 (10:40 -0800)
committerEvan Martin <martine@danga.com>
Thu, 3 Feb 2011 18:40:42 +0000 (10:40 -0800)

Trivial merge