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

[leigh123linux]

commit 69687ec766bea6f3977d82d182a8a8ef50f5a058
Merge: be4caa2 fd89128
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:57:02 2013 +0000

    Merge branch 'master' into f20

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