Merge remote-tracking branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Oct 2012 14:18:44 +0000 (15:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Oct 2012 14:18:44 +0000 (15:18 +0100)

Trivial merge