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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9804c81727161fbd7ddc59dcd962e6aab83ffb12

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

commit 9804c81727161fbd7ddc59dcd962e6aab83ffb12
Merge: 4dd0fd3... b22501b...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 30 13:33:51 2012 +0100

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

 mk/config.mk.in       |    2 +-
 rts/Linker.c          |  345 +++++++++++++++++++++++++++++++++++++++++++++++--
 rts/LinkerInternals.h |    6 +-
 3 files changed, 341 insertions(+), 12 deletions(-)