ref: c0705c9a9457e5a13e20bb71d8b14e4399ffc02f
parent: c40815889c460edd815ead46f1593510e0c56147
parent: 635dfa9043c05bc875bc5c3a77b48ea768b730f0
author: Ori Bernstein <orib@google.com>
date: Mon Oct 8 08:41:48 EDT 2012
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc Conflicts: 6/main.c muse/muse.c