Merge commit 'korg/cupcake'
The Android Open Source Project [Fri, 27 Mar 2009 22:30:36 +0000 (15:30 -0700)]

Trivial merge