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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0034b43ce788f9a0192bdb834dbe8cb34c2b8527

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

commit 0034b43ce788f9a0192bdb834dbe8cb34c2b8527
Merge: 7b0f95c... f630970...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 9 13:28:29 2012 +0000

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

 aclocal.m4                      |    5 ++-
 compiler/coreSyn/CoreUnfold.lhs |   81 ++++++++++++++++++++++++++++++++++++++-
 compiler/main/DriverPipeline.hs |   13 ++++--
 compiler/utils/Platform.hs      |    2 +
 utils/ghc-pkg/Main.hs           |   70 +++++++++++++++++++--------------
 validate                        |    2 +-
 6 files changed, 134 insertions(+), 39 deletions(-)