From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2010 22:37:43 +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=c017f784e762a1bb0fa733319193b21e92bb5b6a;p=ipfire-3.x.git

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

c017f784e762a1bb0fa733319193b21e92bb5b6a