Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 16 May 2012 10:14:21 +0000 (11:14 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 16 May 2012 10:14:21 +0000 (11:14 +0100)
commit7fe110aaf5d464b7934e1429b943d862a6da8c06
tree8015bac396d0c821f4501a1ebfefc758dc1505a9
parent969f8b728be0a2fec8263e8866295776c993394b
parent921530b477867edb5158e4ad5bbbdb5c7c531c97
Merge branch 'master' of darcs.haskell.org/ghc