simonmar 2005/04/25 02:08:26 PDT Modified files: (Branch: ghc-6-4-branch) ghc/compiler/parser Parser.y.pp Log: merge rev. 1.25 Revision Changes Path 1.23.2.2 +19 -9 fptools/ghc/compiler/parser/Parser.y.pp