[xfce4-settings/el6: 24/24] Merge from master - 4.8.2

[Orion Poplawski]

commit d18f449fa454669d251e2cd5d184adb1d0e5c46c
Merge: 25b690d 6c17ba2
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu May 19 14:20:46 2011 -0600

    Merge from master - 4.8.2

 .gitignore                        |    4 +
 sources                           |    2 +-
 xfce4-settings-4.6.0-fedora.patch |    2 +-
 xfce4-settings-4.6.4-dsofix.patch |   24 ------
 xfce4-settings.spec               |  153 +++++++++++++++++++------------------
 5 files changed, 86 insertions(+), 99 deletions(-)
---