Merge rsync://bughost.org/repos/ieee80211-delta/