[mate-file-manager-image-converter/f18: 8/8] Merge branch 'master' into f18

[Dan Mashal]

commit d482c0b04c6b6c186570bf074dcaf639b4747956
Merge: 3d76155 e5322ea
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue May 28 10:33:19 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-file-manager-image-converter.spec

 .gitignore                             |    1 +
 mate-file-manager-image-converter.spec |   19 ++++++++++---------
 sources                                |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
---