merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:47 +0000 (07:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:47 +0000 (07:45 -0700)
commit342e88d67ec8add7505f70a9aae5609a1ec9ec34
treed9c1b2893938b27a9b7f96c1dc39d64e3ce62446
parentecdc293b46c0f5a0ae5d4b73586dda74ab09e5e4
parent6b89d26c61c8778736d212c896042b8a5b08dbbe
merge from donut