From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Oct 2010 11:07:21 +0000 (+0200)
Subject: Merge remote branch 'stevee/x-fixes' into installer
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee0585c81a856db030e34dcbd744ac97bdc331c;p=ipfire-3.x.git

Merge remote branch 'stevee/x-fixes' into installer
---

eee0585c81a856db030e34dcbd744ac97bdc331c