OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:28:15 +0000 (08:28 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:28:15 +0000 (08:28 -0700)

Trivial merge