OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 9 Nov 2009 00:07:04 +0000 (16:07 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 9 Nov 2009 00:07:04 +0000 (16:07 -0800)

Trivial merge