OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 2 Nov 2009 22:15:58 +0000 (14:15 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 2 Nov 2009 22:15:58 +0000 (14:15 -0800)

Trivial merge