reconcile donut open-source snapshot into donut
Jean-Baptiste Queru [Wed, 29 Jul 2009 17:40:32 +0000 (10:40 -0700)]

Trivial merge