Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 30 Jun 2011 13:49:14 +0000 (14:49 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 30 Jun 2011 13:49:14 +0000 (14:49 +0100)
1  2 
compiler/coreSyn/CoreSubst.lhs

Simple merge