[cinnamon] Patch so screen lock uses gnome-screensaver

[leigh123linux]

commit 0d3739f14b8d791daae80881d8a9af0e89aa38ae
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Jun 6 11:36:55 2013 +0100

    Patch so screen lock uses gnome-screensaver
    
    - add gnome-screensaver autostart files
    - add patch to remove obex file transfer

 cinnamon.spec |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 191ee02..a99e96d 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,10 +1,7 @@
 Name:           cinnamon
 Version:        1.9.1
-<<<<<<< HEAD
-Release:        3%{?dist}
-=======
 Release:        4%{?dist}
->>>>>>> f19
+
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com