[Hs-Generics] patch applied (generics): Another conflict resolve patch

Mon Jun 18 02:16:07 PDT 2007 agerdes@mac.com * Another conflict resolve patch M ./comparison/NOW/NOW.hs -12 +1 M ./comparison/NOW/Paradise.lhs -1 +1