merge madwifi trunk changeset 2597