Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 11:18:05 +0000 (12:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 11:18:05 +0000 (12:18 +0100)
1  2 
compiler/cmm/CLabel.hs

Simple merge