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

[leigh123linux]

commit 61d9cd7a97e32e46f0b67a3a533b2e98ecdbe3ac
Merge: e7a3615 89aa277
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Dec 7 20:57:28 2013 +0000

    Merge branch 'master' into f19

 cinnamon.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---