OSDN Git Service

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

Trivial merge