Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Fri, 10 Jun 2011 23:56:19 +0000 (23:56 +0000)
committerDavid Waern <david.waern@gmail.com>
Fri, 10 Jun 2011 23:56:19 +0000 (23:56 +0000)
1  2 
compiler/parser/Parser.y.pp
compiler/rename/RnNames.lhs
compiler/typecheck/TcBinds.lhs

Simple merge
Simple merge
Simple merge