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

[leigh123linux]

commit 10a6e449c638273eed02d8b5ff8d45ccdc7cd61c
Merge: b7f2f1c 47562d9
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 10 22:24:51 2013 +0100

    Merge branch 'master' into f19

 cinnamon.spec                      |   13 +++++++++++--
 org.cinnamon.settings-users.policy |   20 ++++++++++++++++++++
 replace_gksu.patch                 |    2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)
---