EFL migration revision 67695

Merge remote branch 'origin/upstream'

Conflicts:
	src/lib/ecore_imf/ecore_imf_context.c
	src/modules/immodules/scim/scim_imcontext.cpp

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

diff --cc src/lib/ecore_con/Ecore_Con.h
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_private.h
Simple merge

diff --cc src/lib/ecore_imf/ecore_imf_context.c
Simple merge

diff --cc src/lib/ecore_x/Ecore_X.h
Simple merge