OSDN Git Service

Merge from cupcake
authorJean-Baptiste Queru <jbq@google.com>
Tue, 4 Aug 2009 14:21:46 +0000 (07:21 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 4 Aug 2009 14:22:17 +0000 (07:22 -0700)

Trivial merge