From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Feb 2010 20:49:11 +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=19d5147c0d7c807323213190161dc9bc075cb95b;p=ipfire-3.x.git

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

19d5147c0d7c807323213190161dc9bc075cb95b