Merge branch 'tc-untouchables', remote branch 'origin' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 1 Sep 2012 19:51:51 +0000 (20:51 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 1 Sep 2012 19:51:51 +0000 (20:51 +0100)

Trivial merge