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

[leigh123linux]

commit e93ece655fe616a9f13b1b34eb0329aa3982068e
Merge: e61f628 df1c130
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 18 00:04:26 2013 +0100

    Merge branch 'master' into f19

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