From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Oct 2010 12:17:43 +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=ed269f50648132f414d7ef2d01bb3252130692d7;p=ipfire-3.x.git

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

ed269f50648132f414d7ef2d01bb3252130692d7