Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:13 +0000 (18:33 -0700)]

Trivial merge