Merge change Ia48b3f2a into eclair

* changes:
  Fix #2313887: Device doesn't boot after rebooting device...