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

[leigh123linux]

commit bc48132a9154a058f65b09cb1dc7ce6c2e76a247
Merge: 2e29dbe fd89128
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:57:48 2013 +0000

    Merge branch 'master' into f19

 cinnamon.spec     |    7 ++++++-
 compile_fix.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---