[mate-common/f16: 4/4] Merge branch 'master' into f16

[Dan Mashal]

commit c57106bb7214957ce993d929317dab0d71f68cda
Merge: b1f974c 528293e
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Jan 14 19:19:41 2013 -0800

    Merge branch 'master' into f16

 .gitignore       |    1 +
 mate-common.spec |   21 ++++++++++++---------
 sources          |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)
---