Merge commit 'remotes/korg/cupcake' into cupcake_to_master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:31 +0000 (16:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:31 +0000 (16:57 -0700)
commit782d3581cb6057d55030f30a0e3ee35d19e95737
treeb12fa45dc18f43812a6570065727922e96a96d44
parent03874566c6f74e11d030fa2c534b3dd5a06721af
parentc285feace7a051368d4c5069cc6e0f30cd769f0d
Merge commit 'remotes/korg/cupcake' into cupcake_to_master