Merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Tue, 29 Sep 2009 16:07:27 +0000 (09:07 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 29 Sep 2009 16:07:27 +0000 (09:07 -0700)
commitf855d5120165aa09dfed692fa84ab1aed6ce42af
tree3eabe2247bf4296150a28103c6aefcf75b9e3460
parentdcd7dc3ee2384feadcfb7807e7fa6dc16462a815
parentb5cb069207c839cd60a91e42939c936c4a8b1380
Merge from donut