Merge branch 'master' of mac:ghc/git/val32/.
authorIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 12:54:40 +0000 (13:54 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 12:54:40 +0000 (13:54 +0100)
commit65fc37a798cb3220b32eee6fb2115301f112a015
tree570705c81b59eecb6e1eeb91223ca6838f53b88e
parent690f7ec4cd51cee854cb2bd57f53cbb7d7167038
parent676bc14e3a49fbc2e9a8343c65a56455c4e5e303
Merge branch 'master' of mac:ghc/git/val32/.