[xorg-x11-xdm: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xorg-x11-xdm

[Matej Cepl]

commit 5503a29125169243825561db53c80ece41c9a50b
Merge: b2fac8b fcf1938
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Sep 26 20:08:39 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xorg-x11-xdm
    
    Conflicts:
    	sources

---