Merge from donut
Jean-Baptiste Queru [Wed, 28 Oct 2009 15:34:42 +0000 (08:34 -0700)]

Trivial merge