Merge commit 'e747f79' into donut
The Android Open Source Project [Wed, 29 Apr 2009 04:57:54 +0000 (21:57 -0700)]

Trivial merge