Merge branch 'master' of /home/simonmar/ghc-git/.
authorSimon Marlow <marlowsd@gmail.com>
Wed, 6 Apr 2011 10:27:03 +0000 (11:27 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Wed, 6 Apr 2011 10:27:03 +0000 (11:27 +0100)
commit91bb651a14f8fe4163394f26af50fb8f76fa0607
treeb0c78a36b29777da230a51f9c7c148f2348d9c0f
parentef344a11a5d48f2eccf07fa4dce8e62879e6ff1e
parent78946b2d0699f9b4a2b729a4a4bdd1e1c0ab778a
Merge branch 'master' of /home/simonmar/ghc-git/.
sync-all