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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit d9ee9d9d964c5cc4bc40c2a62d825e4b33548860
Merge: b857c8a... 4f6a56e...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Mar 24 22:25:56 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org//ghc
    
    Conflicts:
    	compiler/main/HscStats.lhs

 .authorspellings                                  |   29 -
 .darcs-boring                                     |  256 ---
 compiler/deSugar/DsMeta.hs                        |   50 +-
 compiler/hsSyn/HsUtils.lhs                        |    5 +-
 compiler/main/{Annotations.lhs => Annotations.hs} |   57 +-
 compiler/main/DynFlags.hs                         |    4 +-
 compiler/main/GhcMake.hs                          | 1246 ++++++------
 compiler/main/HscStats.hs                         |  161 ++
 compiler/main/PackageConfig.hs                    |   48 +-
 compiler/nativeGen/PPC/Ppr.hs                     |  467 +++---
 compiler/rename/RnSource.lhs                      |    4 +-
 compiler/rename/RnTypes.lhs                       |    4 +-
 docs/coding-style.html                            |   28 +-
 docs/index.html.in                                |   22 +-
 docs/users_guide/flags.xml                        |   14 +
 docs/users_guide/runtime_control.xml              |   43 +-
 docs/users_guide/using.xml                        | 2211 ++++++++++++---------
 docs/vh/vh.xml                                    |  591 +++---
 ghc/GhciTags.hs                                   |   17 +-
 includes/HaskellConstants.hs                      |    4 +-
 includes/MachDeps.h                               |   12 +-
 includes/Stg.h                                    |    8 +-
 includes/rts/Constants.h                          |   22 +-
 includes/stg/MachRegs.h                           |  173 +-
 rts/StgCRun.c                                     |   27 +-
 rts/Trace.c                                       |    7 +-
 utils/genapply/GenApply.hs                        |  646 +++---
 utils/genprimopcode/Main.hs                       |  427 ++--
 utils/genprimopcode/Parser.y                      |    1 -
 utils/genprimopcode/ParserM.hs                    |    1 -
 utils/genprimopcode/Syntax.hs                     |   20 +-
 31 files changed, 3330 insertions(+), 3275 deletions(-)


Diff suppressed because of size. To see it, use:

    git show d9ee9d9d964c5cc4bc40c2a62d825e4b33548860