Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 19 Dec 2011 16:45:53 +0000 (16:45 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 19 Dec 2011 16:45:53 +0000 (16:45 +0000)
commita1d588650d715a8c0edd4828e9c2e1dd1d760f48
tree4f10b59ba61c69811075e41c5f00bd995e2f36e4
parentc492e50bd681551e14f12d9fe7479d986b47e9dc
parentf542da48a7c7bdc8c7f116cfbf3db91d7d719196
Merge branch 'master' of darcs.haskell.org//ghc