[commit: ghc] master: Merge branch 'master' of git://git.haskell.org/ghc (69e04fa)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/69e04fad50bd9f0caf4107be662a9ec81edf8763/ghc

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

commit 69e04fad50bd9f0caf4107be662a9ec81edf8763
Merge: dfc51a4 8854d9e
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Oct 23 14:07:31 2013 -0400

    Merge branch 'master' of git://git.haskell.org/ghc



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

69e04fad50bd9f0caf4107be662a9ec81edf8763
 compiler/basicTypes/MkId.lhs          |    6 +-
 compiler/cmm/CmmContFlowOpt.hs        |  434 ++++++++++++++++++++-------------
 compiler/cmm/CmmLayoutStack.hs        |   38 ++-
 compiler/cmm/CmmNode.hs               |    6 +-
 compiler/codeGen/StgCmmHeap.hs        |   62 +++--
 compiler/deSugar/Desugar.lhs          |   40 ++-
 compiler/deSugar/DsBinds.lhs          |   13 +-
 compiler/deSugar/DsExpr.lhs           |   50 ++--
 compiler/deSugar/DsMeta.hs            |    4 +-
 compiler/deSugar/DsMonad.lhs          |   27 +-
 compiler/hsSyn/Convert.lhs            |   28 ++-
 compiler/main/HscMain.hs              |   12 +-
 compiler/main/PprTyThing.hs           |   20 +-
 compiler/rename/RnPat.lhs             |   14 +-
 compiler/simplCore/Simplify.lhs       |    5 +-
 compiler/stgSyn/CoreToStg.lhs         |    3 +-
 compiler/typecheck/TcDeriv.lhs        |   64 ++++-
 compiler/typecheck/TcEvidence.lhs     |    2 +-
 compiler/typecheck/TcInteract.lhs     |    8 +-
 compiler/typecheck/TcTyDecls.lhs      |   27 +-
 compiler/types/Coercion.lhs           |   57 ++++-
 compiler/types/FamInstEnv.lhs         |   16 +-
 compiler/vectorise/Vectorise/Monad.hs |    3 +-
 docs/users_guide/glasgow_exts.xml     |   32 ++-
 rts/Exception.cmm                     |    2 +-
 rts/RaiseAsync.c                      |    2 +-
 26 files changed, 636 insertions(+), 339 deletions(-)