OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:18 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:18 +0000 (14:13 -0700)
commitd2247211f2a7eb070ebbc4a5a2be6045da2525ed
treea8d9bda78f32a505536367dee33564176bccec78
parent76a9d9d1012c67f91193d3ab9fd0706bdf63fc25
parent16f30689dd498791bec0be74e3513252479c4778
merge from donut