Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc