Merge change Ibb5626c5 into eclair

* changes:
  Stop bringing the wifi interface up on reset.