From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2010 23:10:57 +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=e30dbe94a1f0526a8a087f890b396d96f6b3159e;p=ipfire-3.x.git

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

e30dbe94a1f0526a8a087f890b396d96f6b3159e