From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Apr 2008 22:10:23 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~1054
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a95b533ea8b2480ce8c1b3eadfa590f210ff4bb3;p=ipfire-3.x.git

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

Conflicts:

	lfs/initramfs
---

a95b533ea8b2480ce8c1b3eadfa590f210ff4bb3
diff --cc lfs/initramfs
index 9c38cccdd,df98da7ee..85dbc3cd9
--- a/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