OSDN Git Service

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

Trivial merge