Merge branch 'openid2'
authorArt Cancro <ajc@uncensored.citadel.org>
Thu, 1 Dec 2011 17:44:25 +0000 (12:44 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Thu, 1 Dec 2011 17:44:25 +0000 (12:44 -0500)

Trivial merge