[xfwm4/el6: 12/12] Merge from master - 4.8.1

[Orion Poplawski]

commit 793640d0a7010bad07b9a770226c9abbea3434a1
Merge: c6cde38 287d1e3
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu May 19 14:40:31 2011 -0600

    Merge from master - 4.8.1

 .gitignore               |    4 +-
 sources                  |    2 +-
 xfwm4-4.6.1-dsofix.patch |   12 -----
 xfwm4.spec               |  112 ++++++++++++++++++++++++++++++----------------
 4 files changed, 78 insertions(+), 52 deletions(-)
---
diff --cc .gitignore
index 6d812c9,66fbd3a..cd4a8a3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,3 @@@
--xfwm4-4.6.2.tar.bz2
+ /xfwm4-4.7.4.tar.bz2
+ /xfwm4-4.8.0.tar.bz2
+ /xfwm4-4.8.1.tar.bz2