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)
commitbfbf3858110b1e16b2efd89f691e426b03e52343
tree7f8b2aa422c9a372b0c8034670a058025b5dcbdc
parenta347cd7c384eb255b5507a40840205d052f137c6
parente49dae36a00b2af8f6ad583dd24f9bacf5711242
Merge branch 'master' of darcs.haskell.org/ghc
compiler/coreSyn/CoreSubst.lhs