From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 2 Nov 2009 22:15:58 +0000 (-0800)
Subject: merge from open-source master
X-Git-Tag: android-x86-2.2~10^2~7
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fprebuilt.git;a=commitdiff_plain;h=b2a60c266de17184393cbf081b7d5b660ac24919

merge from open-source master
---

b2a60c266de17184393cbf081b7d5b660ac24919