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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/44febbcca3255cca222a1489e582d283d7bd9b04

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

commit 44febbcca3255cca222a1489e582d283d7bd9b04
Merge: 1050b33... 22b51da...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue May 22 15:15:26 2012 +0100

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

 aclocal.m4                     |   71 +++++++++++---------------
 compiler/deSugar/DsForeign.lhs |   25 +++++++--
 compiler/main/DynFlags.hs      |    4 ++
 compiler/main/GhcMake.hs       |   27 +++++-----
 compiler/prelude/PrelNames.lhs |    6 +-
 compiler/utils/Panic.lhs       |   36 ++++++++-----
 configure.ac                   |    2 +-
 ghc.mk                         |    3 +-
 ghc/GhciMonad.hs               |    3 +-
 ghc/InteractiveUI.hs           |    3 +-
 ghc/ghc-bin.cabal.in           |    2 +-
 packages                       |    1 -
 rts/Adjustor.c                 |  112 ++++++++++++++++++++++++++--------------
 rts/Prelude.h                  |    8 ++--
 rts/package.conf.in            |    4 +-
 rts/win32/libHSbase.def        |    1 -
 utils/runghc/runghc.hs         |   14 +++--
 validate                       |    7 ++-
 18 files changed, 189 insertions(+), 140 deletions(-)