Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 7 Jun 2012 16:29:57 +0000 (17:29 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 7 Jun 2012 16:29:57 +0000 (17:29 +0100)
commit3fc546fe23108f29045c194898e1cc87e13592a7
treedc6e6f42660788ab5af5c6feb67fa2cc89a8358d
parentd814d50585f2a2406c56d8199612e219ee2d6eb7
parent21a53a1cd5a9784aca7b78cc972f917e71938124
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc