Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Mon, 28 Mar 2011 00:20:22 +0000 (17:20 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Mon, 28 Mar 2011 00:20:22 +0000 (17:20 -0700)
commitddac2a6a7301788326cd9107965e59fc0804daad
treec4b1f2ff04e0845b97d1f402d50619580193eafe
parentd2f8b78bd409c650513d03603863c1de1e1ed31e
parente2be3300379a5c0e1397c33f7b983a5259c5f51b
Merge branch 'master' of git.megacz.com/coq-hetmet

Conflicts:
src/Extraction-prefix.hs
src/Extraction-prefix.hs