From: root <root@Averatec.(none)>
Date: Mon, 5 Jan 2009 18:30:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.5-beta1~229
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=18680014062bb8e975258eb74c9f19aa9c478bd6;hp=5b5d45775bf147a5729b3dcc5f98a12646c75031

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d58bd73ddf..797041889c 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -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
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 4b261f3a60..acb3c0d4e8 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -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
 ;
 }