Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 Jan 2013 17:01:49 +0000 (17:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 Jan 2013 17:01:49 +0000 (17:01 +0000)
commit5469388bdee59967f8262d5285ff9522d52ff191
treeed694241803c33ade86030fdfa6378ed1671d0e4
parent2cc42dbb6ff09f4105fe44fe1afe9ac08a140d44
parentfb93d791c341c1e6616d1ba363bf68c138978dc2
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc