Merge change I446bf8b5 into eclair

* changes:
  SecuritySettings: minor tuning.