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

[leigh123linux]

commit 2e29dbee5465bd4cc0ca34d0e67d8f71e1099748
Merge: 87af7c1 5e838c1
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:09:21 2013 +0000

    Merge branch 'master' into f19

 .gitignore                 |    1 +
 autostart.patch            |    4 +-
 cinnamon-nm-applet.desktop |  140 --------------------------------------------
 cinnamon.spec              |   23 +++-----
 restore_panel_bounce.patch |   33 ----------
 sources                    |    2 +-
 6 files changed, 13 insertions(+), 190 deletions(-)
---