Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:11:01 +0000 (12:11 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:11:01 +0000 (12:11 +0100)

Trivial merge