Merge branch 'fix#5464' of http://darcs.haskell.org/ghc into fix#5464