[Upstream migration @62307] Merge remote branch 'origin/upstream'

Conflicts:
	.gitignore

diff --cc .gitignore
index 5a69096,8c225d5..72b0619
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -80,29 -80,5 +80,31 @@@ Makefile.i
  /stamp-h1
  /doc/Doxyfile
  /src/bin/ecore_test
+ /src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
+ /src/util/makekeys
 +debian/*.debhelper.log
 +debian/*.substvars
 +debian/*.debhelper
 +debian/libecore-bin/
 +config.guess.cdbs-orig
 +config.sub.cdbs-orig
 +debian/files
 +debian/libecore-con/
 +debian/libecore-config/
 +debian/libecore-data/
 +debian/libecore-dbg/
 +debian/libecore-dev/
 +debian/libecore-doc/
 +debian/libecore-evas/
 +debian/libecore-fb/
 +debian/libecore-file/
 +debian/libecore-imf/
 +debian/libecore-input/
 +debian/libecore-ipc/
 +debian/libecore-x/
 +debian/libecore/
 +debian/stamp-*
 +debian/tmp/
 +doc/html/
 +doc/latex/
 +doc/man/

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

diff --cc src/lib/ecore_evas/ecore_evas_x.c
index d3dcb58,1869b76..a66caad
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/ecore_imf_context.c
Simple merge

diff --cc src/lib/ecore_x/Ecore_X.h
index 630e11b,05f7e9f..a06136e
mode 100755,100644..100755
--- 1/src/lib/ecore_x/Ecore_X.h
--- 2/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h