merge from donut master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:11 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:13:11 +0000 (14:13 -0700)
commit946fa82bce5557cbd10ccdc06822f037302f7c84
tree3cab09b57404e0b236326f7f2b993331e8256d51
parentc0c2ddfc50264fff95a0b2a2b69484a6871b9be8
parent1b9bdcb9b78d5638eb5a745647cefe89d24d9cf7
merge from donut