OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:26 +0000 (07:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:26 +0000 (07:45 -0700)
commitc1e553a9cfe14dc0f4aea9784553a178bfe74acc
tree0c722ced21166d5b6a79cc7c0aa14d073934bdd4
parent61e844f48e5c7fc7446b364d4b273c3457327f5e
parentfde8642fc43bdd224e43e5ee9583a49a758fb03c
merge from donut