Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 23:50:38 +0000 (23:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 23:50:38 +0000 (23:50 +0000)
commit9429d79454cb89e49908bb21bca783c2ad8e02e8
tree4cdbf867857208d4d4e15bb3068943a3e67ec2fa
parentbe5cc2e33aa8e54299527af9b91e659d54c4cde5
parent3394d49af13697626145aca6d80b65ae8661418c
Merge branch 'master' of darcs.haskell.org/ghc