OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 28 Oct 2009 21:52:33 +0000 (14:52 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 28 Oct 2009 21:52:33 +0000 (14:52 -0700)

Trivial merge