Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Jun 2012 08:47:07 +0000 (09:47 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Jun 2012 08:47:07 +0000 (09:47 +0100)
commit7fb4a5bcefb77f15336fb173da099c4692919b8c
treecfe30170d50e6603e1aa7f0d7deb0ab67c99e3b4
parent3a266f1308104ccbcca435ad9632738734e13c84
parent3fc546fe23108f29045c194898e1cc87e13592a7
Merge branch 'master' of darcs.haskell.org/ghc