Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 15:15:47 +0000 (15:15 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 15:15:47 +0000 (15:15 +0000)

Trivial merge