[commit: ghc-prim] fix#5464: Merge branch 'fix#5464' of /home/staff/magal101/repos/ghc/libraries/ghc-prim into fix#5464 (418a919)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/ghc-prim

On branch  : fix#5464

http://hackage.haskell.org/trac/ghc/changeset/418a919080c099d941b59d5d08fad72b0b4b3da5

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

commit 418a919080c099d941b59d5d08fad72b0b4b3da5
Merge: 990b296... 60a85ba...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Mon Sep 26 09:24:45 2011 +0200

    Merge branch 'fix#5464' of /home/staff/magal101/repos/ghc/libraries/ghc-prim into fix#5464
    
    Solved conflicts:
    	GHC/Types.hs