am 3957b3c1: Merge "scan only when wifi is enabled" into froyo

Merge commit '3957b3c147673d631feef2df49f1177289e08d41' into kraken

* commit '3957b3c147673d631feef2df49f1177289e08d41':
  scan only when wifi is enabled