Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Jan 2013 13:57:37 +0000 (13:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Jan 2013 13:57:37 +0000 (13:57 +0000)

Trivial merge