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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5dedffb3b314bb93ec4d0cf2b5da98297333f201

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

commit 5dedffb3b314bb93ec4d0cf2b5da98297333f201
Merge: 35d213a... dd96a19...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Aug 2 08:18:40 2011 +0100

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

 compiler/ghci/keepCAFsForGHCi.c   |    4 +-
 compiler/main/HscMain.lhs         |   27 ++++++++-----
 compiler/prelude/PrelNames.lhs    |   51 ++++++++++++------------
 compiler/typecheck/TcInteract.lhs |    2 +-
 distrib/configure.ac.in           |   31 ++++++++++++++-
 includes/rts/storage/GC.h         |   44 +++++++++++++++++++++
 rts/Linker.c                      |    1 +
 rts/RtsFlags.c                    |    5 ++
 rts/Stats.c                       |   77 +++++++++++++++++++++++++++++++++++-
 rts/hooks/OnExit.c                |    2 +-
 rts/posix/OSThreads.c             |    6 +-
 utils/hp2ps/AreaBelow.c           |    2 +-
 utils/hp2ps/AuxFile.c             |   12 ++----
 utils/hp2ps/Axes.c                |   18 +++-----
 utils/hp2ps/Curves.c              |   25 ++++--------
 utils/hp2ps/Deviation.c           |    5 +-
 utils/hp2ps/Dimensions.c          |    7 +--
 utils/hp2ps/Error.c               |    3 +-
 utils/hp2ps/HpFile.c              |   40 +++++++------------
 utils/hp2ps/Key.c                 |    5 +-
 utils/hp2ps/Main.c                |   13 ++----
 utils/hp2ps/Marks.c               |    5 +-
 utils/hp2ps/PsFile.c              |   35 ++++++++---------
 utils/hp2ps/Reorder.c             |    9 +---
 utils/hp2ps/Scale.c               |    4 +-
 utils/hp2ps/Shade.c               |   16 ++-----
 utils/hp2ps/TopTwenty.c           |    2 +-
 utils/hp2ps/TraceElement.c        |    2 +-
 utils/hp2ps/Utilities.c           |   26 ++++---------
 utils/unlit/unlit.c               |    6 +--
 30 files changed, 289 insertions(+), 196 deletions(-)