From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Feb 2010 19:08:10 +0000 (+0100)
Subject: Merge commit 'trikolon/naoki' into ms-master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c60fff478975d21da1cc27fc995eea674807bc97;p=ipfire-3.x.git

Merge commit 'trikolon/naoki' into ms-master
---

c60fff478975d21da1cc27fc995eea674807bc97