Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Mar 2013 12:17:35 +0000 (12:17 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Mar 2013 12:17:35 +0000 (12:17 +0000)

Trivial merge