[xorg-x11-xinit/f13/master: 9/9] Merge branch 'f12' into f13

[Matej Cepl]

commit 831ee1315cb76292a193eba4f39cd1c13cc9824c
Merge: 0132250 0a4e866
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 27 16:26:44 2010 +0200

    Merge branch 'f12' into f13
    
    Conflicts:
    	xorg-x11-xinit.spec

 xorg-x11-xinit.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---