merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:17 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:17 +0000 (14:13 -0700)
commitdbc76518512a1a5d8a0fe09e20e5aac692fd9ac4
tree8ed204aef68b0c77ccc0a43567974cea32c67f45
parenta14633f29d49ed37ba3f690a7b9ceed002992b84
parent89d4bc914ba0250e8d7a3c216e466799a985dd16
merge from donut