Merge ../HEAD
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Aug 2012 14:30:38 +0000 (15:30 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Aug 2012 14:30:38 +0000 (15:30 +0100)

Trivial merge