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