Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:17 +0000 (17:12 -0700)]

Trivial merge