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

[leigh123linux]

commit 2bca84bbafd9db73a8269366b8449dc7b601ae5b
Merge: 18f492c a3ec317
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 9 17:02:23 2013 +0100

    Merge branch 'master' into f19

 .gitignore       |    1 +
 cinnamon.spec    |   19 +++++++------
 git_rollup.patch |   76 ------------------------------------------------------
 sources          |    2 +-
 4 files changed, 12 insertions(+), 86 deletions(-)
---