Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Jean-Baptiste Queru [Wed, 18 Mar 2009 23:57:39 +0000 (16:57 -0700)]

Trivial merge