merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)]

Trivial merge