From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Aug 2010 18:45:17 +0000 (+0200)
Subject: Merge commit 'stevee/naoki-fix' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e61541dca0f18c9a1df5920e07288feeedea73;p=ipfire-3.x.git

Merge commit 'stevee/naoki-fix' into next
---

b3e61541dca0f18c9a1df5920e07288feeedea73