merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:11 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:11 +0000 (14:13 -0700)
commit012c15220108e49446d20449fd0986ecec920882
treef8f1e4b42f8a0ea41b29b3adaafead613b7665ae
parentd2d068a2306649ec0324cb8e3fcaa5fc1f0af1db
parente34c847d89accef6129d8de814f31f396e021098
merge from donut