[commit: base] master: Merge branch 'ghc-generics' of http://darcs.haskell.org/packages/base into ghc-generics (0d363cf)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0d363cf82a46a55b7d0b407fb667f9ea9756a578

>---------------------------------------------------------------

commit 0d363cf82a46a55b7d0b407fb667f9ea9756a578
Merge: 7e0984f... 479397b...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed May 25 07:54:29 2011 +0100

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