Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Oct 2011 14:44:02 +0000 (15:44 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Oct 2011 14:44:02 +0000 (15:44 +0100)
commit02779cb1bd2141a98b0e60481a4c7c23d44ed7e4
tree0285c0bc63bdae6fe379b87b669fbfdd17865c1e
parentaf457be67075fecb7b87be8f1c85619caad0f5ee
parent0d6529f669104b6f22049d456a9600d949a09018
Merge branch 'master' of darcs.haskell.org/ghc