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

[leigh123linux]

commit 37b328422deac4f376579b05819bc2cb866d4722
Merge: 3f19b71 bef8851
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 31 12:35:32 2012 +0000

    Merge branch 'master' into f18

 .gitignore                                  |    1 +
 cinnamon-1.6.0_favourite-apps-firefox.patch |    4 ++--
 cinnamon.spec                               |    8 ++++++--
 sources                                     |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
---