[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (99af12a)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/99af12a7c7126540e6e1887af41ff50040dcf033

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

commit 99af12a7c7126540e6e1887af41ff50040dcf033
Merge: d31036e... 9572477...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Feb 14 14:53:28 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 compiler/basicTypes/Name.lhs        |   24 ++++++++++++++++-
 compiler/basicTypes/RdrName.lhs     |    6 +++-
 compiler/hsSyn/HsTypes.lhs          |    2 +-
 compiler/prelude/PrelNames.lhs-boot |    3 +-
 compiler/typecheck/TcSimplify.lhs   |    2 +
 compiler/types/TypeRep.lhs          |   42 +++++++++++++++---------------
 rts/Stable.c                        |   48 ++++++++++++++++++++--------------
 rts/sm/GCAux.c                      |    8 ++++++
 8 files changed, 89 insertions(+), 46 deletions(-)