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

Conflicts:

	lfs/initramfs

diff --cc lfs/initramfs
index f5c029ba73df4c12bda3db11566bb57d17679dd8,dd77a4a8e6ef2ef34bb335584b7d174590bb9016..df98da7ee43b9769823982509cf4b0a34330d823
--- 1/lfs/initramfs
--- 2/lfs/initramfs
+++ b/lfs/initramfs
@@@ -174,7 -174,10 +174,9 @@@ $(TARGET) 
        
        ### compressing everything
        #
-       cd $(INSTALLER_DIR) && find . | cpio -o -H newc | lzma e -si -so > \
 -      -find $(INSTALLER_DIR) -name .svn -exec rm -rf {} \;
+       cd $(INSTALLER_DIR) && find . | cpio -o -H newc | gzip -9 > \
        /images/initramfs-$(VERSION).img
-               
+       
+       #| lzma_sdk e -d16 -si -so
+       
        @$(POSTBUILD)