Merge commit 'korg/cupcake'
The Android Open Source Project [Wed, 15 Apr 2009 01:18:15 +0000 (18:18 -0700)]

Trivial merge