[gnome-icon-theme/f19: 7/7] Merge branch 'master' into f19

[Dan Mashal]

commit 69b1e207a2e3b3fc55f03b1c9e5736123dde6add
Merge: a047d57 ffa0f36
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Jun 11 03:38:56 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	gnome-icon-theme.spec

 gnome-icon-theme.spec |   60 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 19 deletions(-)
---