OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)

Trivial merge