Merge change I1538dba4 into eclair

* changes:
  Make FWK start a wifi scan if supplicant forgets. (do not merge)