OSDN Git Service

Merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Wed, 14 Oct 2009 01:04:35 +0000 (18:04 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 14 Oct 2009 01:06:23 +0000 (18:06 -0700)

Trivial merge