reconcile donut open-source snapshot into donut
Jean-Baptiste Queru [Fri, 24 Jul 2009 19:29:27 +0000 (12:29 -0700)]

Trivial merge