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