Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Tue, 8 May 2012 17:31:47 +0000 (18:31 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 8 May 2012 17:31:47 +0000 (18:31 +0100)
1  2 
rts/Linker.c

diff --cc rts/Linker.c
Simple merge