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

[leigh123linux]

commit a331cf693db85dd33abac2355fb043027ed697b8
Merge: 8057ec4 c606504
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 7 22:18:21 2013 +0100

    Merge branch 'master' into f19

 cinnamon-fedora.gschema.override |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---