Merge
Android Code Review [Sat, 28 Feb 2009 00:58:50 +0000 (16:58 -0800)]

Trivial merge