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

[leigh123linux]

commit 5b1363e278f875af2900a2b047617268b387a8c4
Merge: 544cefe 113da80
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Feb 9 15:39:49 2014 +0000

    Merge branch 'master' into f19

 cinnamon.spec   |    9 ++++++++-
 set_wheel.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)
---