From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 4 Sep 2009 14:51:15 +0000 (-0700)
Subject: merge from open-source master
X-Git-Tag: android-x86-2.2~36^2~85
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40812278;p=android-x86%2Fpackages-apps-DeskClock.git

merge from open-source master
---

4081227849a0c5037b7a180e6734c74b92a832fc