Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Sat, 25 Jun 2011 18:51:12 +0000 (19:51 +0100)
committerIan Lynagh <igloo@earth.li>
Sat, 25 Jun 2011 18:51:12 +0000 (19:51 +0100)
commit632f2b2918927543630959252f5f7f4111567689
tree3e87c669d2e4d5ab508bb87a7bbe2e3e57e5c203
parent3d47d0bd64595891c23fcb72177f6853385d1fbb
parent66878b11d22c05d65da45b8964226109b8313271
Merge branch 'master' of darcs.haskell.org/ghc