OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Fri, 4 Sep 2009 14:51:13 +0000 (07:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 4 Sep 2009 14:51:13 +0000 (07:51 -0700)

Trivial merge