Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 10:17:03 +0000 (11:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 10:17:03 +0000 (11:17 +0100)

Trivial merge