OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:06 +0000 (14:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:06 +0000 (14:57 -0700)
commitf38daf5f3c999660684f1585bd4dc11a1fdd0b83
tree5fc9f22bc7ad31db55fd6c6cd88ce7e5a94febe3
parentf0f40832ff5cefe9fd2c32182d05ea94239d56d4
parentc36be694884845d67080705e40b80b2944e765ec
merge from donut