Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor
authorDimitrios.Vytiniotis <dimitris@microsoft.com>
Wed, 4 Apr 2012 16:03:09 +0000 (17:03 +0100)
committerDimitrios.Vytiniotis <dimitris@microsoft.com>
Wed, 4 Apr 2012 16:03:09 +0000 (17:03 +0100)
1  2 
compiler/typecheck/TcMType.lhs

Simple merge