[commit: base] master's head updated: Merge remote branch 'origin/master' into ghc-generics (54fb2ef)

[Simon Peyton Jones]

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

Branch 'master' now includes:

     dfbc01d... Initial commit for Pedro's generic-default mechanism
     b76137d... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     eb87007... Add instances for basic types of the new generic deriving mechanism.
     4817fca... Comment the generics stuff instances in GHC.Int, for now.
     e95046e... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     df8d9fc... Moved the CString functions to GHC.CString in ghc-prim (needed for the new generic deriving mechanism).
     092841b... Move Eq and Ord for Int from GHC.Base to GHC.Classes, so they are not longer orphan.
     9d3a29e... Add Representable0 instances to Either and Maybe.
     76dbb23... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     792a8b8... Adapt to the renaming of `Representable0` to `Generic`.
     decc272... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     6c37984... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     7e0984f... Merge remote branch 'origin/master' into ghc-generics
     479397b... Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
     0d363cf... Merge branch 'ghc-generics' of http://darcs.haskell.org/packages/base into ghc-generics
     54fb2ef... Merge remote branch 'origin/master' into ghc-generics