OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)

Trivial merge