OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)

Trivial merge