From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Nov 2009 15:24:51 +0000 (+0100)
Subject: Merge commit 'ms/naoki' into naoki
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abd844d80e4348fbc363456ec20abd499c50c05;p=ipfire-3.x.git

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

2abd844d80e4348fbc363456ec20abd499c50c05