Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 20:42:29 +0000 (21:42 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 20:42:29 +0000 (21:42 +0100)
1  2 
compiler/hsSyn/HsTypes.lhs
compiler/parser/Parser.y.pp

Simple merge
Simple merge