OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:12:45 +0000 (14:12 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:12:45 +0000 (14:12 -0700)

Trivial merge