[xfce-utils/el6: 4/4] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 203cf06a2d1e95f289409a8e370720b92528a818
Merge: 27d05c9 988c743
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Sep 23 10:29:19 2011 -0600

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore      |    2 ++
 sources         |    2 +-
 xfce-utils.spec |   14 ++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)
---