[ecore/f19: 5/6] Merge branch 'master' into f19

[Dan Mashal]

commit 0c295cdaf5f672e2e13f6a7940fad8464dd5bc8c
Merge: 601bff4 5aa6541
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Aug 16 08:18:30 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	ecore.spec

 .gitignore |    2 ++
 ecore.spec |    7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---