From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Jan 2010 14:12:26 +0000 (+0100)
Subject: Merge branch 'naoki'
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=32aeedbf57e93a3d37d8b096ad27a80feb96b71b

Merge branch 'naoki'

Conflicts:
	make.sh
---

32aeedbf57e93a3d37d8b096ad27a80feb96b71b