merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:07 +0000 (14:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 29 Jul 2009 21:57:07 +0000 (14:57 -0700)
commitecdc293b46c0f5a0ae5d4b73586dda74ab09e5e4
tree3f16bbc23207d5b64dbbc4961f5646c1c5d3157c
parent99b7c9cd9e8ca3277105d2a050e6d32fa5513ad6
parent9013215a4b8e304962b953766a1c83058cd44300
merge from donut