Bug 848334 - [Settings] Disable WPS on Wi-Fi disabled
Merge pull request #8929 from masap/20130402

Bug 848334 - [Settings] Disable WPS on Wi-Fi disabled, r=kaze