From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Feb 2010 21:16:18 +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=30cb2c66c4686c800748bb27e62661cc06004ee6;p=ipfire-3.x.git

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

30cb2c66c4686c800748bb27e62661cc06004ee6