[mate-session-manager/f17: 9/9] Merge branch 'master' into f17

[Dan Mashal]

commit 7b181210f113ec40ddce272cde6fcf5522397f92
Merge: a5338d8 37f2536
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue May 28 01:59:48 2013 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	mate-session-manager.spec
    	sources

 .gitignore                |    4 ++
 mate-session-manager.spec |   36 +++++++++++++++--------
 sources                   |    4 ++
 x-caja.patch              |   69 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 13dc7ed,1050b8b..c566040
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,8 @@@
  /mate-session-manager-1.4.0.tar.xz
  /mate-session-manager-1.5.0.tar.xz
  /mate-session-manager-1.5.1.tar.xz
++<<<<<<< HEAD
 +/mate-session-manager-1.5.2.tar.xz
++=======
+ /mate-session-manager-1.6.0.tar.xz
++>>>>>>> master
diff --cc sources
index 70f88f1,b9e1354..b5d661e
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +75373b3d5d0d8f5f8f105f34de238a11  mate-session-manager-1.5.2.tar.xz
++=======
+ a8e1e83cabbf0ec3ec130c07f9038dcd  mate-session-manager-1.6.0.tar.xz
++>>>>>>> master