Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 17:04:02 +0000 (17:04 +0000)
committerDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 17:04:02 +0000 (17:04 +0000)
1  2 
compiler/parser/Parser.y.pp
compiler/rename/RnSource.lhs
compiler/typecheck/TcBinds.lhs

Simple merge
Simple merge
Simple merge