Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Feb 2013 13:55:03 +0000 (13:55 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Feb 2013 13:55:03 +0000 (13:55 +0000)
1  2 
compiler/typecheck/TcInstDcls.lhs

Simple merge