Merge branch 'openID' of git://git.openstreetmap.org/rails into openid