From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 22 May 2010 21:23:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f633f44c35d3333dc2a3df76855e1f92812e5b65;p=ipfire-3.x.git

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

Conflicts:
	pkgs/toolchain/glibc/patches
---

f633f44c35d3333dc2a3df76855e1f92812e5b65