From: Schantl Stefan <Stevee@ipfire.org>
Date: Thu, 9 Sep 2010 17:20:54 +0000 (+0200)
Subject: Merge branch 'no-toolchain' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e907733c11c9bce5ea80c7b1d06ddebc1bbdc4;p=ipfire-3.x.git

Merge branch 'no-toolchain' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into ms-no-toolchain

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

d1e907733c11c9bce5ea80c7b1d06ddebc1bbdc4