From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Feb 2010 21:43:04 +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=cfdb379ee5dfe3221bb94517f163e42876720980;p=ipfire-3.x.git

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

cfdb379ee5dfe3221bb94517f163e42876720980