Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 11 Feb 2013 08:38:33 +0000 (08:38 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 11 Feb 2013 08:38:33 +0000 (08:38 +0000)
commit804d8f6036e3c646255132e2da42f81cd81e5154
tree319aad3d488d9c0397c06ff7bc1a8d879e83252f
parent33683ba9367e03b6b051f1c0c694fd8bf244a759
parent426a027f1043a4fe47759806ea11164c63d810f3
Merge branch 'master' of darcs.haskell.org/ghc