Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 09:58:10 +0000 (11:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 09:58:10 +0000 (11:58 +0200)
commit0e46fd59368d536db566cba4a6796e2c5d814746
treea8c85f414ff065ee40eefbafa4bb7032ce9ebdad
parent966306c72529c88a39dc3d9ad031e725b90d5de3
parent52071035c62ef92c1ba3872be059d4b631cfe20d
Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'

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