[evas/f19: 4/4] Merge branch 'master' into f19

[Dan Mashal]

commit 6569c63e054a07322ed18c5d023a275d6027ae90
Merge: a4902f4 6755ace
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu Nov 7 22:30:52 2013 -0800

    Merge branch 'master' into f19

 .gitignore |    1 +
 evas.spec  |   12 ++++++++++--
 sources    |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---