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)
1  2 
compiler/types/TyCon.lhs

Simple merge