Merge branch 'openID' of git://github.com/avar/osm-website into openID
authorKai Krueger <kai@aiputerlx.(none)>
Tue, 27 Apr 2010 20:37:40 +0000 (21:37 +0100)
committerKai Krueger <kai@aiputerlx.(none)>
Tue, 27 Apr 2010 20:37:40 +0000 (21:37 +0100)

Trivial merge