Merge commit 'local-master/master' into with-passes
authorNorman Ramsey <nr@cs.tufts.edu>
Wed, 21 Apr 2010 21:40:43 +0000 (17:40 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Wed, 21 Apr 2010 21:40:43 +0000 (17:40 -0400)
1  2 
src/hoopl.cabal

diff --cc src/hoopl.cabal
Simple merge