merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:45 +0000 (07:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 3 Aug 2009 14:45:45 +0000 (07:45 -0700)
commitd2d068a2306649ec0324cb8e3fcaa5fc1f0af1db
tree78cfa4254b50070fcc4e116552caefaa26790a5b
parent8aa454c5f55e03141b676894a5cfa06f361d3ee9
parent4926f353a7197b404eb9747efa157ddf0a7d23c1
merge from donut