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

Conflicts:

	lfs/initramfs

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