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

[Dan Mashal]

commit 5e4355a89527cbcd35ce6160e804e910b46f40e8
Merge: d85fdea 528293e
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Jan 14 19:26:22 2013 -0800

    Merge branch 'master' into f17

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