[mate-desktop/f18: 2/2] Merge branch 'master' into f18

[Dan Mashal]

commit c091c380a1b41beb2f7335319a6dc272976a2859
Merge: 078cb67 d580878
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 25 10:41:07 2013 -0700

    Merge branch 'master' into f18

 .gitignore        |    1 +
 mate-desktop.spec |    7 ++++---
 sources           |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---