From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Jul 2010 11:48:59 +0000 (+0200)
Subject: Merge commit '9b6f6f2ef960a1225d84dcae863c7d2856b2d359'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61a300fb2aecd9f9c3b3e07dbe2421229edbb04f;p=ipfire-3.x.git

Merge commit '9b6f6f2ef960a1225d84dcae863c7d2856b2d359'
---

61a300fb2aecd9f9c3b3e07dbe2421229edbb04f