Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
authorGrant Slater <openstreetmap@firefishy.com>
Sat, 31 Dec 2011 00:07:49 +0000 (00:07 +0000)
committerGrant Slater <openstreetmap@firefishy.com>
Sat, 31 Dec 2011 00:07:49 +0000 (00:07 +0000)

Trivial merge