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

[leigh123linux]

commit d28747f96922632db059f570d8f69a91aff79703
Merge: 381343a 49c70df
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Jun 9 23:46:06 2013 +0100

    Merge branch 'f19'
    
    Conflicts:
    	autostart_nemo.patch

 .gitignore           |    1 +
 autostart_nemo.patch |    4 ++--
 cinnamon.spec        |   29 ++++++++++++++++++++++++++++-
 sources              |    1 +
 4 files changed, 32 insertions(+), 3 deletions(-)
---