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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/58e156a6102d57bc69b4ccd2fede03fb15040d78

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

commit 58e156a6102d57bc69b4ccd2fede03fb15040d78
Merge: 90a8c94... e9bc0dd...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jun 23 08:22:16 2011 +0100

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

 aclocal.m4                 |   52 ++++++++++++++++++++++++++++++++++++++++++++
 compiler/cmm/CmmOpt.hs     |    7 ++++-
 compiler/ghc.mk            |    2 -
 compiler/main/SysTools.lhs |   39 ++++++++++++++------------------
 configure.ac               |   22 +-----------------
 distrib/configure.ac.in    |    2 +
 mk/config.mk.in            |    5 ----
 settings.in                |    9 +++++--
 sync-all                   |    1 +
 9 files changed, 85 insertions(+), 54 deletions(-)