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

[leigh123linux]

commit e7a36151f1db095d50b22b9b3de2767308a9dc23
Merge: 7dcd0ca 285cc66
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Dec 4 00:04:52 2013 +0000

    Merge branch 'master' into f19

 cinnamon.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---