From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Aug 2010 13:54:19 +0000 (+0200)
Subject: Merge commit 'stevee/x-fixes'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eec6c0b5945014b2eb047b255efa443c83ec4ac;p=ipfire-3.x.git

Merge commit 'stevee/x-fixes'
---

9eec6c0b5945014b2eb047b255efa443c83ec4ac