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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6496c6f1421c3890e7fe72823c29584e5200f3fd

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

commit 6496c6f1421c3890e7fe72823c29584e5200f3fd
Merge: f0c760c... b8fe21e...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jan 11 08:32:02 2012 +0000

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

 aclocal.m4                     |   43 +++++++++++++++
 compiler/coreSyn/CoreSyn.lhs   |    8 +++
 compiler/main/SysTools.lhs     |    4 +-
 compiler/prelude/PrelNames.lhs |   71 ++++++++++++++++---------
 compiler/prelude/PrelRules.lhs |  112 +++++++++++++++++++++++++---------------
 configure.ac                   |   12 ++++
 mk/config.mk.in                |    3 +
 settings.in                    |    4 +-
 8 files changed, 187 insertions(+), 70 deletions(-)