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)
commit69605562f4961fb38939a0b729d650953e46e041
tree31a3569858ee6da7685c30a3db755aed08d5f967
parent661c1c112eb40efd75ac61643c3e1231f60d58d4
parentf73d60bee5154777eb2515c0df806ddc928f874f
Merge branch 'master' of darcs.haskell.org/ghc
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcRnTypes.lhs