am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()

src/com/android/settings/vpn/VpnSettings.java

@@ -948,6 +948,7 @@ public class VpnSettings extends PreferenceActivity implements
                 pskProfile.setPresharedKey(key);
                 // pass through
 
+            case L2TP_IPSEC:
             case L2TP:
                 L2tpProfile l2tpProfile = (L2tpProfile) p;
                 key = KEY_PREFIX_L2TP_SECRET + p.getId();