Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)
committerroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)
doc/packages-list.txt
html/cgi-bin/pppsetup.cgi

index d58bd73ddf1d71ca2e13d99dc177031f9e2f5ae1..797041889c0f356acd81d234ad49d0dada9292d2 100644 (file)
@@ -68,7 +68,7 @@
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-004
-* cryptsetup-1.0.5
+* cryptsetup-1.0.6
 * cups-1.3.9
 * curl-7.15.3
 * cyrus-imapd-2.2.12
index 4b261f3a603523b8d9fd42b657a3ef5c3c8ed161..acb3c0d4e8c52c7b45001c02d3c31aa5cafe72e6 100644 (file)
@@ -488,7 +488,7 @@ chomp ($atmdev);
 if ($atmdev ne '') {
         print <<END
         <option value='pppoeatm' $selected{'TYPE'}{'pppoeatm'}>PPPoE over ATM-BRIDGE</option>
-        <option value='pptpatm' $selected{'TYPE'}{'pppoeatm'}>PPTP over ATM-BRIDGE</option>    
+        <option value='pptpatm' $selected{'TYPE'}{'pptpatm'}>PPTP over ATM-BRIDGE</option>     
 END
 ;
 }