Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 16:07:59 +0000 (17:07 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 16:07:59 +0000 (17:07 +0100)
commitc163e38a581694a3518720500fcc5a1dd5336f0c
tree5e8e28a87bf2db07b568ea2150dc36897f109a49
parentdda1c1b5484247390368e21eeb3ae0880e19d608
parentcc5d9dca79b588985c059a85624b4ad4c4406c3b
Merge branch 'master' of darcs.haskell.org/ghc
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcSMonad.lhs