From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2010 20:50:02 +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=7b29fb2f2451954236e8fbc69bdbcb2cace626dd;p=ipfire-3.x.git

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

7b29fb2f2451954236e8fbc69bdbcb2cace626dd