Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios.Vytiniotis <dimitris@microsoft.com>
Fri, 8 Jun 2012 15:07:57 +0000 (16:07 +0100)
committerDimitrios.Vytiniotis <dimitris@microsoft.com>
Fri, 8 Jun 2012 15:07:57 +0000 (16:07 +0100)
1  2 
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcRnMonad.lhs
compiler/typecheck/TcRnTypes.lhs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge