Merge remote-tracking branch 'origin/HEAD' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 29 Aug 2012 14:35:27 +0000 (15:35 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 29 Aug 2012 14:35:27 +0000 (15:35 +0100)

Trivial merge