merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:15 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:15 +0000 (14:13 -0700)
commita791004bcbaf01c893bdaaabe566af25aabfff6b
tree5c6af91c1490df91bf26b042d0c1541b2fb9df2c
parent342e88d67ec8add7505f70a9aae5609a1ec9ec34
parent6d34074d24f430e46d1a66dd1515715515fd0da3
merge from donut