Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 27 Jun 2011 08:15:03 +0000 (09:15 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 27 Jun 2011 08:15:03 +0000 (09:15 +0100)
commit6ed586542afab8b18bcb45ac649a89e13e258643
tree50980371a3342627db19b840ecd0559d3ec56c62
parent2395cdff13a150016ec47bbe7da7bb8239b3a252
parent8023014ecf192381ffba4b60a3dd21630e5c1d18
Merge branch 'master' of darcs.haskell.org/ghc