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

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into replace-openlldp-with-lldpd

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

10ea9d90e678deac729ac49513a03d80c346d963