Merge branch 'master' into openidselector
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:25:04 +0000 (21:25 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:25:04 +0000 (21:25 -0400)

Trivial merge