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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/37549fa8a1fd2b4b9c72564cd7c1db4cfe7bcb32

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

commit 37549fa8a1fd2b4b9c72564cd7c1db4cfe7bcb32
Merge: 3bf0520... 1422ea4...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Aug 3 07:47:23 2011 +0100

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

 aclocal.m4              |   50 +++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac            |   43 ++++++++-------------------------------
 distrib/configure.ac.in |   35 +-------------------------------
 3 files changed, 59 insertions(+), 69 deletions(-)