Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Thu, 13 May 2010 12:36:31 +0000 (13:36 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 13 May 2010 12:36:31 +0000 (13:36 +0100)

Trivial merge