merge from donut
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]

Trivial merge