From: Evan Martin <martine@danga.com>
Date: Sun, 19 Dec 2010 23:03:23 +0000 (-0800)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: release-120715~566^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702;p=platform%2Fupstream%2Fninja.git

Merge remote branch 'origin/master'
---

3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702