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)
commita7bfdbf2f55c95403fc54bc43c86f2d2f0aeee22
treecccb52556ce0910e2a6a406f56e5ccb1fefc55a5
parentd5cf3a95cce2d9699d2c3f5998d51302f51aa03c
parentb7c844e7cf05b4cea629178bfa793321391d21de
merge from open-source master