From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Mar 2010 21:34:51 +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=75bd2cbf43561afc611be06c12b8b523637e7534;p=ipfire-3.x.git

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

75bd2cbf43561afc611be06c12b8b523637e7534