Merge branch 'master' of /home/simonmar/ghc-git/.
authorSimon Marlow <marlowsd@gmail.com>
Mon, 23 May 2011 09:24:53 +0000 (10:24 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 23 May 2011 09:24:53 +0000 (10:24 +0100)
commit5e0059a9fd797d550aa7dd856a14c12eb0914578
tree6cf568d74b5b1b266ee3ef762d58f75661be4946
parent36df2f39af4d132dac4acbc11a271a95e2254e42
parent96d64fe2175d829f9499656750d51cf577ff9892
Merge branch 'master' of /home/simonmar/ghc-git/.

* 'master' of /home/simonmar/ghc-git/.:
  Revert "Add capability sets to the event system. Contains code from Duncan Coutts."