From: Schantl Stefan <Stevee@ipfire.org>
Date: Mon, 5 Apr 2010 18:48:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into multipath-tools
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6070be30bbae86aefc9d0359f74220cc8d6c6bd0;p=ipfire-3.x.git

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

Conflicts:
	pkgs/toolchain/binutils-static/patches
---

6070be30bbae86aefc9d0359f74220cc8d6c6bd0