Merge rsync://bughost.org/repos/ieee80211-delta/
authorJeff Garzik <jgarzik@pobox.com>
Fri, 21 Oct 2005 18:58:47 +0000 (14:58 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 21 Oct 2005 18:58:47 +0000 (14:58 -0400)

Trivial merge