Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Jul 2011 07:16:23 +0000 (08:16 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Jul 2011 07:16:23 +0000 (08:16 +0100)
1  2 
compiler/basicTypes/VarEnv.lhs

Simple merge