From: Schantl Stefan <Stevee@ipfire.org>
Date: Fri, 19 Mar 2010 21:52:37 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into clean
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f28f3f056c879081c2043e76e5ac9ff314c68fda;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into clean

Conflicts:
	pkgs/core/tar/tar.nm
---

f28f3f056c879081c2043e76e5ac9ff314c68fda