Merge branch 'master' of http://darcs.haskell.org//ghc
authorRoss Paterson <ross@soi.city.ac.uk>
Fri, 4 Nov 2011 15:42:16 +0000 (15:42 +0000)
committerRoss Paterson <ross@soi.city.ac.uk>
Fri, 4 Nov 2011 15:42:16 +0000 (15:42 +0000)
commited26b477377ac4ac2277a82effb8d1b830843851
treeb93b80be9b27f361d1355fb97ff307288e7654f8
parentda11a22547426f717cab676c6fc03cda42dbd6c5
parentc739d845f9b3fc67ee20aa3de7e876cb1327bb1a
Merge branch 'master' of darcs.haskell.org//ghc