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)
1  2 
sync-all

diff --cc sync-all
Simple merge