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

[leigh123linux]

commit b3a6ac3942d12ac5aa896950fdfbb36467f7ccc8
Merge: 35cb09c 055dbf6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 17 17:16:25 2013 +0100

    Merge branch 'master' into f19

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