pull fixes from branch_1_1

diff --git a/share/dictionary.erx b/share/dictionary.erx
index 4da8cbf..2a44f0f 100644 (file)
--- a/share/dictionary.erx
+++ b/share/dictionary.erx
@@ -52,8 +52,8 @@ ATTRIBUTE     ERX-Tunnel-Virtual-Router               8       string
 ATTRIBUTE      ERX-Tunnel-Password                     9       string
 ATTRIBUTE      ERX-Ingress-Policy-Name                 10      string
 ATTRIBUTE      ERX-Egress-Policy-Name                  11      string
-ATTRIBUTE      ERX-Ingress-Statistics                  12      string
-ATTRIBUTE      ERX-Egress-Statistics                   13      string
+ATTRIBUTE      ERX-Ingress-Statistics                  12      integer
+ATTRIBUTE      ERX-Egress-Statistics                   13      integer
 ATTRIBUTE      ERX-Atm-Service-Category                14      integer
 ATTRIBUTE      ERX-Atm-PCR                             15      integer
 ATTRIBUTE      ERX-Atm-SCR                             16      integer

diff --git a/share/dictionary.usr b/share/dictionary.usr
index 54f82a9..966ae4c 100644 (file)
--- a/share/dictionary.usr
+++ b/share/dictionary.usr
@@ -498,8 +498,8 @@ ATTRIBUTE   USR-Auth-Mode                           0xf003  integer
 #VALUE         USR-Character-Echo      Echo-On                 0
 #VALUE         USR-Character-Echo      Echo-Off                1
 
-VALUE  USR-PW_Framed_Routing_V2        Off                     0
-VALUE  USR-PW_Framed_Routing_V2        On                      1
+#VALUE USR-PW_Framed_Routing_V2        Off                     0
+#VALUE USR-PW_Framed_Routing_V2        On                      1
 
 VALUE  USR-Syslog-Tap                  Off                     0
 VALUE  USR-Syslog-Tap                  On-Raw                  1