Merge remote branch 'remotes/apmon/openID' into openID
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:50:01 +0000 (20:50 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:50:01 +0000 (20:50 +0000)

Trivial merge