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

[Simon Peyton Jones]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/de3a50bdf8dd8327ae47e0e942541f4b7bf54a3e

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

commit de3a50bdf8dd8327ae47e0e942541f4b7bf54a3e
Merge: a37a7f7 2154b82
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 8 12:17:35 2013 +0000

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

 compiler/cmm/CmmNode.hs              |   5 +-
 compiler/codeGen/StgCmmForeign.hs    |  53 ++--
 compiler/main/DriverPipeline.hs      | 241 +++++++++--------
 compiler/main/DynFlags.hs            |   3 +
 compiler/main/GHC.hs                 |  10 +-
 compiler/main/GhcMake.hs             |   8 +-
 compiler/main/HscMain.hs             | 507 +++++++++++++----------------------
 compiler/typecheck/TcDeriv.lhs       |  97 ++++---
 configure.ac                         |   3 +
 docs/users_guide/extending_ghc.xml   |   4 +-
 docs/users_guide/flags.xml           |   3 +-
 docs/users_guide/glasgow_exts.xml    |   3 +-
 includes/rts/storage/ClosureMacros.h |   4 -
 rts/LdvProfile.c                     |   2 +-
 utils/ltx/Makefile                   |  12 -
 utils/ltx/ltx.prl                    | 229 ----------------
 utils/verbatim/Makefile              |  17 --
 utils/verbatim/verbatim.lex          |  63 -----
 18 files changed, 427 insertions(+), 837 deletions(-)