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)
commit9be3b55216be0700832ffa33ff0c2eb6beb93376
treedb73ff512ce0a82d1fd5657a54c4e45d469ce7b7
parentbf5af91ca597666641b8519abc85a31297b30823
parent969383ba17493d67664b2c0faaec481561401b18
Merge branch 'master' of darcs.haskell.org/ghc
compiler/cmm/CLabel.hs