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

[Dan Mashal]

commit 55ca0008ec9fe540cac80f21c32e5b0b24a1c0af
Merge: 3eb34f9 31224fb
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Jun 11 04:35:32 2013 -0700

    Merge branch 'master' into f17

 .gitignore           |    2 ++
 mate-icon-theme.spec |   11 +++++++++--
 sources              |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---