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)
commit5f7c1a7d95eff21af938a65f4ce462049fc70ff9
tree4cab5b1aabb6231acb80c82a866dcb5dfcad5eef
parentb1f40f1416593355ceb3ea70e7b58a97e0f42579
parent0076786de1c4450743803be8b23a0f3e5c47e4ee
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
compiler/prelude/PrelNames.lhs