[cinnamon/f20: 2/2] Merge branch 'master' into f20

[leigh123linux]

commit e721cd50bde1e1d7e1bc602523f7fb6fa649cb48
Merge: c49768f 055dbf6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 17 17:17:22 2013 +0100

    Merge branch 'master' into f20

 autostart_nemo.patch   |    4 +-
 cinnamon.spec          |    5 +
 git_rollup_fixes.patch |  267 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 274 insertions(+), 2 deletions(-)
---