OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 14 Oct 2009 19:26:31 +0000 (12:26 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 14 Oct 2009 19:26:31 +0000 (12:26 -0700)

Trivial merge