From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Feb 2010 18:41:26 +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=294f5bb0c451732883b20d43911182869bae6e7a;p=ipfire-3.x.git

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

294f5bb0c451732883b20d43911182869bae6e7a