OSDN Git Service

merge from donut-gms
authorJean-Baptiste Queru <jbq@google.com>
Thu, 8 Oct 2009 17:00:39 +0000 (10:00 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 8 Oct 2009 17:00:39 +0000 (10:00 -0700)

Trivial merge