From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Feb 2010 21:11:15 +0000 (+0100)
Subject: Merge commit 'stevee/naoki' into ms-master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf1b9ffbbaff60d80e523c2aab3a92db73b9b2d;p=ipfire-3.x.git

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

1cf1b9ffbbaff60d80e523c2aab3a92db73b9b2d