From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 May 2012 09:58:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e46fd59368d536db566cba4a6796e2c5d814746;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'

Conflicts:
	xorg-x11-server/xorg-x11-server.nm
---

0e46fd59368d536db566cba4a6796e2c5d814746