tree 0c0c0c81adc23a530561b2188b281f1a5655ab6e
parent 530a97e46dec40c36a7ab4f86db0f98660312170
parent e8a868f9e10fdade859b44607e513bb6564bc4b0
author Jean-Baptiste Queru <jbq@google.com> 1229702042 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1229702042 -0800

Merge commit 'remotes/korg/cupcake'