[commit: ghc-prim] ghc-generics1: Merge remote-tracking branch 'origin/master' into ghc-generics1 (46c712b)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/ghc-prim

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/46c712b9263f882b23611a5b4586448fd0d454c6

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

commit 46c712b9263f882b23611a5b4586448fd0d454c6
Merge: 7e835c9... 5291677...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jun 5 20:52:19 2012 +0100

    Merge remote-tracking branch 'origin/master' into ghc-generics1

 GHC/Classes.hs |    2 ++
 GHC/Types.hs   |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)