Merge change Ibf07c83d into eclair

* changes:
  SecuritySettings: remove debug messages.