OSDN Git Service

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

Trivial merge