Merge commit 'remotes/korg/cupcake' into cupcake_to_master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:37 +0000 (16:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:37 +0000 (16:57 -0700)
commit517a0e86cbbc677bfc3dfa9b373a12a9f7b8ebb2
tree39b5ea8fb392b6983dea27f96343bd7e891785be
parent8c63892438fbb7ef754e55c60220dd02e7c8fd70
parenta89495f48f185779ff7d9d64ce6e6b037c9ded87
Merge commit 'remotes/korg/cupcake' into cupcake_to_master