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

diff --combined make.sh
index f96a6b4d1ebb5f5811e45210b9ca4575a83c6506,ee87961936ebb21a274edfafdf91d83335bcffef..7ae50022b3848fff55d7a58d8c68b93c5a623378
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.9"                                                 # Version number
  CORE="51"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="50"                                             # Core Level (PAKFIRE)
 +PAKFIRE_CORE="51"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -358,6 -358,7 +358,7 @@@ buildipfire() 
    ipfiremake which
    ipfiremake xz
    ipfiremake linux-firmware
+   ipfiremake zd1211-firmware
    ipfiremake linux                    XEN=1
    ipfiremake kqemu                    XEN=1
    ipfiremake v4l-dvb                  XEN=1
@@@ -689,6 -690,7 +690,7 @@@
    ipfiremake parted
    ipfiremake swig
    ipfiremake python-m2crypto
+   ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
    ipfiremake python-satsolver