From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Mar 2010 22:16:34 +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=4381818d4d698b73b45c6edc81f2c32db01e81ad;p=ipfire-3.x.git

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

4381818d4d698b73b45c6edc81f2c32db01e81ad