Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 22 Aug 2011 07:09:45 +0000 (08:09 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 22 Aug 2011 07:09:45 +0000 (08:09 +0100)
1  2 
compiler/rename/RnSource.lhs

Simple merge