[libXxf86dga/f19: 3/3] Merge branch 'master' into f19

[Peter Hutterer]

commit a93a6fb0c4f19da8a204e6384a3b0b5fc849acc2
Merge: ffb5259 91b82d9
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 28 09:49:15 2013 +1000

    Merge branch 'master' into f19
    
    Conflicts:
    	libXxf86dga.spec

 libXxf86dga.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---