Merge ../wireless-dev-legacy into wireless-dev-2007-08-10