Merge branch 'trac_5025' of https://github.com/thoughtpolice/ghc