Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 28 Jan 2013 13:51:55 +0000 (13:51 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 28 Jan 2013 13:51:55 +0000 (13:51 +0000)
commit163da7f51b76efffbb816c538d81e2afe5f01519
tree7262b7e3c270efc1a2145e294ddefac70de7d5eb
parentf1fa6eb2f5f51307e72b445feac57dfa0ea7b8e6
parent6ff3c31888e614d1f6f78449e41d293612a855be
Merge branch 'master' of darcs.haskell.org/ghc