Merge proposals dependent on lp:~smoser/madwifi/ubuntu

lp:~smoser/madwifi/ubuntu has no merge proposals.