Merge branch 'apt-dht' of ssh://git.camrdale.org/git/apt-dht into apt-dht
authorCameron Dale <camrdale@gmail.com>
Wed, 5 Mar 2008 00:05:22 +0000 (16:05 -0800)
committerCameron Dale <camrdale@gmail.com>
Wed, 5 Mar 2008 00:05:22 +0000 (16:05 -0800)

Trivial merge