From: Evan Martin <martine@danga.com>
Date: Mon, 20 Dec 2010 19:12:21 +0000 (-0800)
Subject: Merge branch 'master' of neugierig.org:projects/git/ninja
X-Git-Tag: release-120715~566
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea24d6f36b452ca5f2c4ec2c75229c3792badd63;p=platform%2Fupstream%2Fninja.git

Merge branch 'master' of neugierig.org:projects/git/ninja

Conflicts:
	src/parsers.cc
	src/parsers_test.cc
---

ea24d6f36b452ca5f2c4ec2c75229c3792badd63