From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Sep 2011 21:07:36 +0000 (+0200)
Subject: Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into... 
X-Git-Tag: v2.9-core54~13^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=974d0b311a731128584332370fc3d0d603ed3c62;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port

Conflicts:
	make.sh
---

974d0b311a731128584332370fc3d0d603ed3c62