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

[leigh123linux]

commit 93d23c2f68b0910e8e98261fcdfa2d1cbad48c21
Merge: ebfdca5 1c021aa
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 14 15:35:10 2013 +0000

    Merge branch 'master' into f19

 cinnamon.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---