[commit: ghc] ghc-lwc: Merge branch 'master' into ghc-lwc-merge (ae4e676)

[Sivaramakrishnan Krishnamoorthy Chandrasekaran]

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

On branch  : ghc-lwc

http://hackage.haskell.org/trac/ghc/changeset/ae4e676d823b53787228643ca6980485185fcc93

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

commit ae4e676d823b53787228643ca6980485185fcc93
Merge: 5d1ff7c... 88f694d...
Author: kc <chandras at cs.purdue.edu>
Date:   Sat May 5 12:02:00 2012 -0400

    Merge branch 'master' into ghc-lwc-merge

 compiler/ghc.mk                   |    4 ++--
 compiler/rename/RnTypes.lhs       |    2 +-
 compiler/simplCore/SimplUtils.lhs |    4 +---
 libffi/ghc.mk                     |    3 +++
 mk/config.mk.in                   |    6 +++++-
 rts/ghc.mk                        |   15 +++++++--------
 rules/build-package-way.mk        |    2 +-
 7 files changed, 20 insertions(+), 16 deletions(-)