From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Feb 2010 11:43:46 +0000 (+0100)
Subject: Merge remote branch 'stevee/naoki'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=170e92a88c48a99115cd9dd6f0648d0539b703f2;p=ipfire-3.x.git

Merge remote branch 'stevee/naoki'
---

170e92a88c48a99115cd9dd6f0648d0539b703f2