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

Merge commit 'stevee/x-server'
---

2570b68b68e1c283d729278fdcc8ea6c62a2d233