Merge commit 'korg/donut'
The Android Open Source Project [Fri, 24 Apr 2009 20:55:03 +0000 (13:55 -0700)]

Trivial merge