Merge branch 'master' of http://git.haskell.org/ghc