Merge change Ia7c57145 into eclair

* changes:
  SecuritySettings: remove trailing spaces.