From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 15 Nov 2009 22:05:55 +0000 (-0800)
Subject: merge from open-source master
X-Git-Tag: android-x86-2.2~136^2~50
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a1dcd3c3c8e38afbc1ab593203545f5dd919fe2;p=android-x86%2Fbuild.git

merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
---

4a1dcd3c3c8e38afbc1ab593203545f5dd919fe2