Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 27 Jul 2011 10:05:30 +0000 (11:05 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 27 Jul 2011 10:05:30 +0000 (11:05 +0100)
commit64a27638cd3260e0487dd43147d55436735763e7
tree214c0974205faa88fba7e850c062117e80b5ae6c
parent3fdd294af643a86162e544f442b0e36c57e1db36
parent7639e7518b8430b3f2eff2b847c3283e0f00e8ec
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/coreSyn/CoreSubst.lhs
compiler/rename/RnNames.lhs
compiler/basicTypes/VarEnv.lhs
compiler/coreSyn/CoreSubst.lhs
compiler/main/HscMain.lhs
compiler/rename/RnNames.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/utils/Outputable.lhs