Merge commit
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 12:26:30 +0000 (13:26 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 12:26:30 +0000 (13:26 +0100)
commit5096055e9aa46a7cc8b5a1292f7094fe588ec4d1
treef6b11ffd5379ffefa29f1c3f9feb5b8734821f02
parentdb4f42a8e38bfead11f5af78557e18b9f42b10b3
parentb855273185a7b86c65172c10674c98bab1052e2c
Merge commit
compiler/types/OptCoercion.lhs
compiler/types/TypeRep.lhs