Merge branch 'tc-untouchables'
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Oct 2012 14:21:22 +0000 (15:21 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Oct 2012 14:21:22 +0000 (15:21 +0100)

Trivial merge