Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 11:01:38 +0000 (12:01 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 11:01:38 +0000 (12:01 +0100)
commit4fbe2780973f33bc1dbe4f75139e278965ac31e1
tree8b749cec2663b8d7383392597987b215c1f88b3c
parentce8ae48278e629b8143edebe05347d92723fdf67
parent37a6a52facd1c3999ce4472c50b0030568be1e04
Merge branch 'master' of darcs.haskell.org/ghc