OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 16 Sep 2009 23:22:13 +0000 (16:22 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 16 Sep 2009 23:22:13 +0000 (16:22 -0700)

Trivial merge