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

[Dan Mashal]

commit 0c917a1f6ab3e150b5a05688a606a1cec83c9e9e
Merge: ec032a8 ad82cda
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 3 14:57:18 2012 -0800

    Merge branch 'master' into f18

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