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

[leigh123linux]

commit 6e2ace78a096a2aac7822f70681487c36df76802
Merge: e41b633 5161429
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 7 12:46:32 2013 +0100

    Merge branch 'master' into f19

 cinnamon.spec    |   10 ++++-
 git_rollup.patch |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 2 deletions(-)
---