[xfdesktop/el6: 17/17] Merge from master - 4.8.2

[Orion Poplawski]

commit 11d670d6b9489ab711584246974792d133db4e51
Merge: 31232ee 8421479
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu May 19 14:47:05 2011 -0600

    Merge from master - 4.8.2

 .gitignore                                |    4 +
 sources                                   |    2 +-
 xfdesktop-4.5.92-backdrop-image.patch     |    2 +-
 xfdesktop-4.5.92-desktop-menu-icon.patch  |   12 ---
 xfdesktop-4.6.0-redhat-menus.patch        |  102 ---------------------
 xfdesktop-4.6.1-education-menu-icon.patch |   10 --
 xfdesktop-4.6.2-dsofix.patch              |   12 ---
 xfdesktop.spec                            |  139 ++++++++++++++++++-----------
 8 files changed, 91 insertions(+), 192 deletions(-)
---