Merge change Ia3acc2ee into eclair

* changes:
  Fix pairings lost on reboot.