Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 Apr 2012 12:51:26 +0000 (13:51 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 Apr 2012 12:51:26 +0000 (13:51 +0100)
commit0646c349b304b43c80334596c8a3145ef3b6d99e
tree263fd52365f8458911777f962c6f89ed1bb99cfc
parentd50cb3eda3912df0d75a8177f04783689b21dc9b
parent488454620b77df3cb19069947ef14a3b445a444c
Merge branch 'master' of darcs.haskell.org/ghc