Merge commit 'remotes/korg/cupcake' into cupcake_to_master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:33 +0000 (16:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 23:57:33 +0000 (16:57 -0700)
commit7246868f2f514641edc05d0b60affa13cb5eead4
treebdcf942d99076e5885a84ff20880dec98f0074d9
parent8d6d7ea32d2e40489fa8be26618167fb6e2dfb40
parentad7e3808a396fbe73d8735d7fb60a4d2fb77153b
Merge commit 'remotes/korg/cupcake' into cupcake_to_master