Merge rsync://bughost.org/repos/ipw-delta/
authorJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 05:47:08 +0000 (00:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 05:47:08 +0000 (00:47 -0500)

Trivial merge