[xorg-x11-resutils/el6/master: 4/4] Merge branch 'master' into el6

[Lubomir Rintel]

commit 26cd8f60b89cabda45702aaabc94e744a67f70ee
Merge: 17bc043 852c1dd
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:28:51 2010 +0200

    Merge branch 'master' into el6

 xorg-x11-resutils.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---