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

[leigh123linux]

commit 50219861f238735c46e7f0c9278200ea1ab406f1
Merge: 56af752 91f25b2
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 5 19:21:49 2013 +0000

    Merge branch 'master' into f20

 cinnamon.spec |    8 +++++++-
 draw_bg.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---