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

[leigh123linux]

commit e61f628a63d0ccef6bdc7a59064474d2749863b2
Merge: b3a6ac3 c34d9c5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 17 22:18:24 2013 +0100

    Merge branch 'master' into f19

 autostart_nemo.patch       |    4 +-
 cinnamon-nm-applet.desktop |  140 ++++++++++++++++++++++++++++++++++++++++++++
 cinnamon.spec              |    9 +++-
 3 files changed, 150 insertions(+), 3 deletions(-)
---