[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (4714d50)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4714d50a5f49b35f1644d1d89de1a732b2e9737b

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

commit 4714d50a5f49b35f1644d1d89de1a732b2e9737b
Merge: bfb7d73... 4c35337...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Sep 9 09:12:48 2011 +0100

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

 aclocal.m4                          |    3 +
 compiler/basicTypes/OccName.lhs     |    2 +-
 compiler/codeGen/CgClosure.lhs      |   33 +++-
 compiler/codeGen/ClosureInfo.lhs    |   37 +---
 compiler/codeGen/StgCmmBind.hs      |   45 ++++-
 compiler/codeGen/StgCmmClosure.hs   |   17 +--
 compiler/deSugar/DsMeta.hs          |    2 +-
 compiler/hsSyn/Convert.lhs          |    2 +-
 compiler/hsSyn/HsDecls.lhs          |    8 +-
 compiler/iface/BinIface.hs          |   15 ++
 compiler/iface/BuildTyCl.lhs        |    7 +-
 compiler/iface/IfaceSyn.lhs         |   36 +++-
 compiler/iface/MkIface.lhs          |   13 +-
 compiler/iface/TcIface.lhs          |   14 ++-
 compiler/nativeGen/X86/Regs.hs      |    4 -
 compiler/parser/Parser.y.pp         |    6 +
 compiler/parser/RdrHsSyn.lhs        |   14 +-
 compiler/rename/RnSource.lhs        |   14 +-
 compiler/specialise/SpecConstr.lhs  |    6 +-
 compiler/typecheck/TcClassDcl.lhs   |    2 +-
 compiler/typecheck/TcEnv.lhs        |    4 +-
 compiler/typecheck/TcInstDcls.lhs   |  329 +++--------------------------
 compiler/typecheck/TcRnDriver.lhs   |   12 +-
 compiler/typecheck/TcTyClsDecls.lhs |  390 ++++++++++++++++++++++++++++++++++-
 compiler/types/Class.lhs            |   44 +++--
 compiler/utils/Util.lhs             |   11 +-
 configure.ac                        |    2 +-
 docs/users_guide/glasgow_exts.xml   |   16 ++-
 ghc.mk                              |    1 +
 mk/config.mk.in                     |   12 +-
 packages                            |    2 +-
 sync-all                            |   13 +-
 32 files changed, 681 insertions(+), 435 deletions(-)