Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 29 Aug 2012 06:35:23 +0000 (07:35 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 29 Aug 2012 06:35:23 +0000 (07:35 +0100)

Trivial merge