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)
commit49d061574206409b9d5bee3ed88e22e55a3e700d
tree2f8ef785a9239acf8106c1e5bbdee04c599c1412
parentc5554f8290f5acc5f52ab1ea6488a75d0ffa34e5
parent3377abeb6bd4623c5806936d0ee569d123c1aa59
Merge branch 'master' of darcs.haskell.org//ghc
compiler/hsSyn/HsTypes.lhs
compiler/parser/Parser.y.pp