Merge commit '7c7adeb' into donut
The Android Open Source Project [Wed, 29 Apr 2009 04:58:02 +0000 (21:58 -0700)]

Trivial merge