Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Mon, 13 Aug 2012 21:52:17 +0000 (22:52 +0100)
committerIan Lynagh <ian@well-typed.com>
Mon, 13 Aug 2012 21:52:17 +0000 (22:52 +0100)
1  2 
rts/Linker.c

diff --cc rts/Linker.c
Simple merge