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

[leigh123linux]

commit c3ba77338c4a2dbeea6f8736979c9fb7a6bdf726
Merge: 4d85760 549c19a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 2 17:58:22 2013 +0100

    Merge branch 'master' into f19

 .gitignore                    |    1 +
 cinnamon-settings-daemon.spec |    5 ++++-
 sources                       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---