OSDN Git Service

merge cupcake into donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)

Trivial merge