Merge branch 'fix#5464' of /home/staff/magal101/repos/ghc/libraries/ghc-prim into...
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 26 Sep 2011 07:24:45 +0000 (09:24 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 26 Sep 2011 07:24:45 +0000 (09:24 +0200)
commitc8d544ef0422448f07b469ea999c3ed922b6f920
treeb731de8443be318fce231dfcdac56d128bbd8e78
parentc0e43d46a708a22341076e20cd29e3e10bb3100c
parent070600248337179b3c99524963aa847943663e57
Merge branch 'fix#5464' of /home/staff/magal101/repos/ghc/libraries/ghc-prim into fix#5464

Solved conflicts:
GHC/Types.hs