Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 27 Jun 2012 20:51:29 +0000 (21:51 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 27 Jun 2012 20:51:29 +0000 (21:51 +0100)
commit30b5ba9b86610f38da704d6b7426cd776e3fbbe4
tree1bde424f1ad18050b93e7c38d7aa61ce9d3dbda5
parentc7a8941b04541789e60950bb126902effae0ccab
parentf75f240bb266ad15935eb360548cf6b987b4953a
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
compiler/basicTypes/Id.lhs
compiler/basicTypes/IdInfo.lhs