Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 6 Jun 2012 21:34:25 +0000 (22:34 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 6 Jun 2012 21:34:25 +0000 (22:34 +0100)
1  2 
compiler/prelude/PrelNames.lhs

Simple merge