Merge change I7fa8c508 into eclair-mr2

* changes:
  make erase-password-on-SIM-change optional