Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)

Trivial merge