Merge ../HEAD
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 17:17:27 +0000 (18:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 17:17:27 +0000 (18:17 +0100)

Trivial merge