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

[Dan Mashal]

commit 3eb34f9e71ed424940a113c7b03f7a9cd1371f9c
Merge: 88b0648 d32b632
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 25 13:36:31 2013 -0700

    Merge branch 'master' into f17

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