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

[Dan Mashal]

commit 531d8f4c995a568d4f6fbf362fd5243a346584de
Merge: ee4595f bd81018
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 26 01:47:43 2013 -0700

    Merge branch 'master' into f17

 .gitignore       |    1 +
 mate-themes.spec |   16 +++++++++++++---
 sources          |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---