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)
commitb41a351025f0a6e96676891415c409060050e7e8
tree181c37eab7353dc8f4865410897c4b8b3b83ed03
parentac11b1f14c3d0d507cf11eade1855ffc440d3b7b
parent1f7433b7b998dda4dde6d09f22a37f637745c079
Merge branch 'master' of darcs.haskell.org/ghc
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcRnMonad.lhs