Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Jul 2012 13:26:36 +0000 (14:26 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Jul 2012 13:26:36 +0000 (14:26 +0100)
commitdf787fa74a59201839ad275fd52b286a6fddd256
tree50bc15140f1db8c76858822b28f9d036269d01ff
parenteb483c0efc7c108675fd09fa0c56cd6173559053
parent43405edbe91d16b289948b9cf442e0bd1b33abdf
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc