Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 28 Aug 2012 12:37:13 +0000 (13:37 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 28 Aug 2012 12:37:13 +0000 (13:37 +0100)
commit1bbdbe55970310f92122fb5321b65705646835b4
treea3353c79609fbbcfacf29ae699363df78cefb67b
parent7dfbed230ceab5b25cc75a0c42bfc94aa918a1bf
parent0e7d2906e706acdd716f121abb19c433986ae830
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc