Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --combined make.sh
index af6b87eb202c5196455b0262a77ec8dfeee08004,979215cfd88c90e2125f8c3de3f19cfe6192a54d..77e3ba9bc4e50f823479f39f5885a154f1a526a6
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.8test"                                             # Version number
- CORE="43"                                                     # Core Level (Filename)
- PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
+ CORE="44"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="43"                                             # 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
@@@ -520,8 -520,6 +520,8 @@@ buildipfire() 
    ipfiremake rrdtool
    ipfiremake setserial
    ipfiremake setup
 +  ipfiremake libdnet
 +  ipfiremake daq
    ipfiremake snort
    ipfiremake oinkmaster
    ipfiremake squid