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

[Dan Mashal]

commit 92b5b052e532fc806bc7bb8f87bf57155e7d54f2
Merge: 9a0fb50 ad82cda
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 3 14:58:07 2012 -0800

    Merge branch 'master' into f16

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