Merge change Ifad4a4c0 into eclair

* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()