Merge donut into master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 23 Apr 2009 00:12:25 +0000 (17:12 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 23 Apr 2009 00:12:25 +0000 (17:12 -0700)

Trivial merge