Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 07:18:40 +0000 (08:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 07:18:40 +0000 (08:18 +0100)
1  2 
compiler/main/HscMain.lhs

Simple merge