Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 13:49:45 +0000 (14:49 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 13:49:45 +0000 (14:49 +0100)

Trivial merge