am 6b32c0a2: (-s ours) am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair

Merge commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520'

* commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state