From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2010 22:55:06 +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=0dcec9e0831dc55894ebf7b5a7f5b6c11cd00749;p=ipfire-3.x.git

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

0dcec9e0831dc55894ebf7b5a7f5b6c11cd00749