[cinnamon: 2/2] Merge branch 'f19'

[leigh123linux]

commit b19f57e3d7558c1bd92d6cadcad705cfc0bbc4f9
Merge: 46a1de5 f9ae343
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jun 7 00:16:29 2013 +0100

    Merge branch 'f19'
    
    Conflicts:
    	cinnamon.spec

 autostart_nemo.patch |    4 ++--
 cinnamon.spec        |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc cinnamon.spec
index 46e1604,3effbd7..b337b90
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@@ -1,7 -1,6 +1,7 @@@
  Name:           cinnamon
  Version:        1.9.1
- Release:        6%{?dist}
+ Release:        7%{?dist}
 +
  Summary:        Window management and application launching for GNOME
  License:        GPLv2+ and LGPLv2+
  URL:            http://cinnamon.linuxmint.com