Merge branch 'apt-dht' of ssh://git.camrdale.org/git/apt-dht into apt-dht