Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics