Merge with EFL svn repo

Merge branch 'svn_merge'

diff --cc src/lib/ecore/ecore.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_x.c
index 6ebe17e,c322f65..aa820fe
mode 100755,100644..100755
--- 1/src/lib/ecore_evas/ecore_evas_x.c
--- 2/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c

diff --cc src/lib/ecore_imf/Makefile.am
Simple merge