From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Feb 2010 19:50:03 +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=7850a5cbf4fb523903750a77ece5f7d4bc165034;p=ipfire-3.x.git

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

7850a5cbf4fb523903750a77ece5f7d4bc165034