Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 17:04:22 +0000 (18:04 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 17:04:22 +0000 (18:04 +0100)
1  2 
compiler/iface/MkIface.lhs
compiler/main/HscTypes.lhs
compiler/rename/RnNames.lhs

Simple merge
Simple merge
@@@ -18,10 -18,9 +18,8 @@@ import HsSy
  import TcEnv            ( isBrackStage )
  import RnEnv
  import RnHsDoc          ( rnHsDoc )
 -import IfaceEnv         ( ifaceExportNames )
  import LoadIface        ( loadSrcInterface )
  import TcRnMonad
- import HeaderInfo       ( mkPrelImports )
  import PrelNames
  import Module
  import Name