Merge remote-tracking branch 'origin/master' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 1 Oct 2012 10:32:44 +0000 (11:32 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 1 Oct 2012 10:32:44 +0000 (11:32 +0100)

Trivial merge