Merge change I11c3cdc7 into eclair

* changes:
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.