Merge branch 'master' into python

Conflicts:
	make.sh

diff --combined make.sh
index 671989b89935c445b75c75c7ed089c66d263f82f,b89c77a4a9f310b487d7754e5692359ac759998a..eb1b89ad991aafdcbe13d22c9d7cc15f6a983a2e
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -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,7 +689,13 @@@
    ipfiremake swig
    ipfiremake python-m2crypto
    ipfiremake crda
- 
+   ipfiremake libsatsolver
 +  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