Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 07:48:56 +0000 (08:48 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 07:48:56 +0000 (08:48 +0100)
commit0f085f36f89d5942ce39ca5389a289d9e112d7c1
treea6403cec363ded63a4500c6d460f040a9e0244cb
parentf450d36a31d6687f338cb6a9590f8c2f689d79fe
parent32841172186b9c17e933a0ba2fe7ead0de73f0c3
Merge branch 'master' of darcs.haskell.org/ghc