Merge branch 'master' into python

diff --combined make.sh
index 5d4e522e4964836e31f978c3e962f8a373eb5e57,f572b9304a7bcdc781d1e65607d1e348a8e8656a..671989b89935c445b75c75c7ed089c66d263f82f
--- 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 IPFire-Team <info@ipfire.org>.                        #
+ # Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
  #                                                                          #
  ############################################################################
  #
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.9"                                                 # Version number
- CORE="48"                                                     # Core Level (Filename)
- PAKFIRE_CORE="47"                                             # Core Level (PAKFIRE)
+ CORE="49"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="48"                                             # 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
@@@ -416,8 -416,6 +416,8 @@@ buildipfire() 
    ipfiremake pam
    ipfiremake openssl
    ipfiremake curl
 +  ipfiremake tcl
 +  ipfiremake sqlite
    ipfiremake python
    ipfiremake fireinfo
    ipfiremake libnet
@@@ -651,6 -649,7 +651,6 @@@
    ipfiremake splix
    ipfiremake streamripper
    ipfiremake sshfs
 -  ipfiremake sqlite
    ipfiremake taglib
    ipfiremake mediatomb
    ipfiremake sslh
@@@ -681,6 -680,7 +681,6 @@@
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 -  ipfiremake tcl
    ipfiremake imspector
    ipfiremake miniupnpd
    ipfiremake client175
@@@ -689,13 -689,6 +689,13 @@@
    ipfiremake swig
    ipfiremake python-m2crypto
    ipfiremake crda
 +  ipfiremake python-distutils-extra
 +  ipfiremake python-lzma
 +  ipfiremake python-progressbar
 +  ipfiremake python-xattr
 +  ipfiremake intltool
 +  ipfiremake pakfire3-deps
 +
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild