Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 Jan 2012 08:32:02 +0000 (08:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 Jan 2012 08:32:02 +0000 (08:32 +0000)
commit6496c6f1421c3890e7fe72823c29584e5200f3fd
tree5db9775ce9493326b6d48b09d49338391ffd0047
parentf0c760ce548a2f2889abfe6a1a726994a418e675
parentb8fe21e9ba5486256c83784ca8b9a839b5c527f4
Merge branch 'master' of darcs.haskell.org/ghc