Merge remote branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 15 Sep 2012 07:09:56 +0000 (08:09 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 15 Sep 2012 07:09:56 +0000 (08:09 +0100)

Trivial merge