[commit: hoopl] master: Merge branch 'ghc-7.4' (1b02b7f)

[Norman Ramsey]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/hoopl

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1b02b7f231a6486534d345cea3e9536c4820a9fd

>---------------------------------------------------------------

commit 1b02b7f231a6486534d345cea3e9536c4820a9fd
Merge: e578e93... 4b2fa9c...
Author: Norman Ramsey <nr at cs.tufts.edu>
Date:   Sat Apr 21 13:08:57 2012 -0400

    Merge branch 'ghc-7.4'
    
    Conflicts:
    	hoopl.cabal