Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 17 Sep 2012 11:05:17 +0000 (12:05 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 17 Sep 2012 11:05:17 +0000 (12:05 +0100)
commitad0139ab1432663ce54324546162ec6edfc960a9
tree08d2fa686ad2cbae305d27aec5c7a87159c2ff9b
parent4026038380ce70a54fd3764f1656baf7cd8df6ff
parent8c3b9aca3aaf946a91c9af6c07fc9d2afb6bbb76
Merge branch 'master' of darcs.haskell.org/ghc
compiler/types/TyCon.lhs