Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Nov 2012 12:18:54 +0000 (12:18 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Nov 2012 12:18:54 +0000 (12:18 +0000)
1  2 
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcRnTypes.lhs

Simple merge
Simple merge