Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 00:37:29 +0000 (17:37 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 00:37:29 +0000 (17:37 -0700)

Trivial merge