OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Nov 2009 16:26:31 +0000 (08:26 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 11 Nov 2009 16:26:31 +0000 (08:26 -0800)

Trivial merge