Merge branch 'ghc-7.4'
authorNorman Ramsey <nr@cs.tufts.edu>
Sat, 21 Apr 2012 17:08:57 +0000 (13:08 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Sat, 21 Apr 2012 17:08:57 +0000 (13:08 -0400)
Conflicts:
hoopl.cabal


Trivial merge