From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 11 Sep 2010 18:09:17 +0000 (+0200)
Subject: Merge branch 'x-fixes' into ms-no-toolchain
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a5ffb32a0d8c3ce6a82204cc72d3dbde2b49fe7;p=ipfire-3.x.git

Merge branch 'x-fixes' into ms-no-toolchain

Conflicts:
	tools/quality-agent.d/050-relro
---

6a5ffb32a0d8c3ce6a82204cc72d3dbde2b49fe7