Merge branch 'master' of /Users/benl/devel/ghc/ghc-head
authorBen Lippmeier <benl@ouroborus.net>
Thu, 12 May 2011 12:38:13 +0000 (22:38 +1000)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 12 May 2011 12:38:13 +0000 (22:38 +1000)
commit7b3a746294d3d034da0052644237e4d1ab1f08c8
treea62d9edbbf6fd6bce657c27614bd813554517827
parent9ae7aca7d1985640aff647de797db2abae49a9a2
parentfd6587b68ad5aa4b6202066b598aec234220bae0
Merge branch 'master' of /Users/benl/devel/ghc/ghc-head