Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:39:46 +0000 (11:39 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:39:46 +0000 (11:39 +0100)
1  2 
compiler/typecheck/TcEnv.lhs

Simple merge