Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Fri, 17 Jun 2011 01:38:18 +0000 (01:38 +0000)
committerDavid Waern <david.waern@gmail.com>
Fri, 17 Jun 2011 01:38:18 +0000 (01:38 +0000)
1  2 
compiler/hsSyn/Convert.lhs
compiler/rename/RnBinds.lhs

Simple merge
Simple merge