Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 15:50:12 +0000 (15:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 15:50:12 +0000 (15:50 +0000)
1  2 
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcRnMonad.lhs

Simple merge
Simple merge