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

[Dan Mashal]

commit 5a1d704fc2f70023797ad1b2f913df7ae334bc38
Merge: debc7d8 0dba32d
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Jun 7 03:07:43 2013 -0700

    Merge branch 'master' into f17

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