Merge branch 'term-fix' of https://github.com/SByer/ninja
authorEvan Martin <martine@danga.com>
Mon, 18 Apr 2011 03:14:31 +0000 (20:14 -0700)
committerEvan Martin <martine@danga.com>
Mon, 18 Apr 2011 03:14:31 +0000 (20:14 -0700)

Trivial merge