Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next

diff --combined make.sh
index 901982b65b2bf490a4fec2e92caac8a8c6e77956,88af89876fcc5192e53d8910a5e203463f076fcf..35912b71c89f9f29b41d06f37b85992ead691516
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -17,7 -17,7 +17,7 @@@
  # along with IPFire; if not, write to the Free Software                    #
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
  #                                                                          #
- # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org>.                   #
+ # Copyright (C) 2007-2013 IPFire Team <info@ipfire.org>.                   #
  #                                                                          #
  ############################################################################
  #
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.13"                                                        # Version number
  CORE="71"                                                     # Core Level (Filename)
- PAKFIRE_CORE="70"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="71"                                             # 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
@@@ -333,7 -333,6 +333,7 @@@ buildbase() 
      lfsmake2 gettext
      lfsmake2 grep
      lfsmake2 groff
 +    lfsmake2 gperf
      lfsmake2 gzip
      lfsmake2 inetutils
      lfsmake2 iproute2