Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
authorGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)
committerGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)

Trivial merge