Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 May 2012 17:03:01 +0000 (18:03 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 May 2012 17:03:01 +0000 (18:03 +0100)
commit09addd354e9828531c89929cba1eca8d290f4b23
tree0f5da4ae7b672e482b7580d3aeb383e040c54d42
parent9806a0a3e288d5ee28b9d8a8cc8cca1d5cc3b134
parentd0f3a8baa11b16dc918a01dfaaf6cfebd9300865
Merge branch 'master' of darcs.haskell.org/ghc