Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)
commit2d5205118357cac8a2dd43b33bcd93a3c00f5558
tree3571265d70bfc01fe4e4df6cc32fbe9627cc7c2a
parent6a1aab7737016aa714b2ffec2b5657a18fac0e42
parent72d4ef338d4d64724cdf6e9ba3e66862082ed45b
Merge branch 'master' of darcs.haskell.org/ghc