OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)

Trivial merge