Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Sat, 11 Jun 2011 16:01:47 +0000 (16:01 +0000)
committerDavid Waern <david.waern@gmail.com>
Sat, 11 Jun 2011 16:01:47 +0000 (16:01 +0000)
1  2 
compiler/deSugar/DsMeta.hs
compiler/rename/RnNames.lhs
compiler/typecheck/TcBinds.lhs

Simple merge
Simple merge
Simple merge