Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 14 Feb 2013 14:39:14 +0000 (14:39 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 14 Feb 2013 14:39:14 +0000 (14:39 +0000)
1  2 
compiler/typecheck/TcSimplify.lhs

Simple merge