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

[Dan Mashal]

commit ee4595fdd0df61fdc83605cd5eed32818585b8ed
Merge: 5a375a5 af28f01
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Nov 22 20:02:37 2012 -0800

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-themes.spec

 mate-themes.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---