merge from donut
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:45 +0000 (07:45 -0700)]

Trivial merge