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

diff --combined make.sh
index f9ae0180f1c684dfdd9a62c47b3fd381d53c8ab1,60eaf87bb8dbad310f47039b3368870cf3a3deb2..d1eecd0ca4bc12c52c5aa3f671b695d40586d6ae
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -334,7 -334,6 +334,7 @@@ buildipfire() 
    ipfiremake libpcap
    ipfiremake ppp
    ipfiremake rp-pppoe
 +  ipfiremake pptp
    ipfiremake unzip
    ipfiremake linux
    ipfiremake atl2
@@@ -585,6 -584,7 +585,7 @@@
    ipfiremake cryptsetup
    ipfiremake splix
    ipfiremake streamripper
+   ipfiremake sshfs
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -669,7 -669,7 +670,7 @@@ buildpackages() 
    fi
  
    # Create updater package
-   ipfiremake updater
+   #ipfiremake updater
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
  
    ipfirepackages