Merge branch 'master' into openswan

Conflicts:
	make.sh

diff --cc doc/packages-list.txt
Simple merge

diff --cc make.sh
index a6ebd3aefa4a81930272c62ec0b00c75ba79c053,ffe637914b22a1a96ab77bfc926fd24bbe814c13..6a1d8b9000875fe17e8a677ceb789b50df13014f
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -344,12 -344,12 +344,12 @@@ buildipfire() 
  #  ipfiremake sane            KMOD=1  SMP=1
  #  ipfiremake openswan                KMOD=1  SMP=1
    ipfiremake linux25
-   ipfiremake atl2                     KVER=2.6.25.17
-   ipfiremake kqemu                    KVER=2.6.25.17
-   ipfiremake v4l-dvb                  KVER=2.6.25.17
-   ipfiremake madwifi                  KVER=2.6.25.17
-   ipfiremake alsa             KMOD=1  KVER=2.6.25.17
-   ipfiremake openswan         KMOD=1  KVER=2.6.25.17
+   ipfiremake atl2                     KVER=2.6.25.18
+   ipfiremake kqemu                    KVER=2.6.25.18
+   ipfiremake v4l-dvb                  KVER=2.6.25.18
+   ipfiremake madwifi                  KVER=2.6.25.18
+   ipfiremake alsa             KMOD=1  KVER=2.6.25.18
 -#  ipfiremake openswan                KMOD=1  KVER=2.6.25.18
++  ipfiremake openswan         KMOD=1  KVER=2.6.25.18
    ipfiremake linux
    ipfiremake atl2
    ipfiremake r8168