Merge branch 'newcg' of /home/simonmar/code-all/work/ghc-newcg into newcg