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

[Peter Hutterer]

commit deb9f5fceafd57185229f7fd645b3db00570dc8c
Merge: 64d1831 8226c42
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 28 09:45:49 2013 +1000

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

 libXres.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---