Merge rsync://bughost.org/repos/ieee80211-delta/
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 12:22:13 +0000 (08:22 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 12:22:13 +0000 (08:22 -0400)

Trivial merge