Merge branch 'upstream'

Merge branch 'upstream'

Conflicts:
	.gitignore
	ChangeLog
	Makefile.am
	configure.ac
	doc/Doxyfile.in
	ecore.spec.in
	src/Makefile.am
	src/lib/ecore/Ecore.h
	src/lib/ecore/Makefile.am
	src/lib/ecore/ecore.c
	src/lib/ecore/ecore_anim.c
	src/lib/ecore/ecore_app.c
	src/lib/ecore/ecore_events.c
	src/lib/ecore/ecore_glib.c
	src/lib/ecore/ecore_idle_enterer.c
	src/lib/ecore/ecore_idle_exiter.c
	src/lib/ecore/ecore_idler.c
	src/lib/ecore/ecore_job.c
	src/lib/ecore/ecore_main.c
	src/lib/ecore/ecore_pipe.c
	src/lib/ecore/ecore_poll.c
	src/lib/ecore/ecore_private.h
	src/lib/ecore/ecore_thread.c
	src/lib/ecore/ecore_timer.c
	src/lib/ecore_con/Ecore_Con.h
	src/lib/ecore_con/ecore_con.c
	src/lib/ecore_con/ecore_con_ares.c
	src/lib/ecore_con/ecore_con_local.c
	src/lib/ecore_con/ecore_con_local_win32.c
	src/lib/ecore_con/ecore_con_private.h
	src/lib/ecore_con/ecore_con_ssl.c
	src/lib/ecore_con/ecore_con_url.c
	src/lib/ecore_evas/Ecore_Evas.h
	src/lib/ecore_evas/Makefile.am
	src/lib/ecore_evas/ecore_evas.c
	src/lib/ecore_evas/ecore_evas_buffer.c
	src/lib/ecore_evas/ecore_evas_private.h
	src/lib/ecore_evas/ecore_evas_x.c
	src/lib/ecore_file/ecore_file_download.c
	src/lib/ecore_imf/Ecore_IMF.h
	src/lib/ecore_imf/Makefile.am
	src/lib/ecore_imf/ecore_imf_context.c
	src/lib/ecore_imf/ecore_imf_private.h
	src/lib/ecore_x/Ecore_X.h
	src/lib/ecore_x/Ecore_X_Atoms.h
	src/lib/ecore_x/ecore_x_atoms_decl.h
	src/lib/ecore_x/xlib/ecore_x_atoms.c
	src/lib/ecore_x/xlib/ecore_x_composite.c
	src/lib/ecore_x/xlib/ecore_x_dnd.c
	src/lib/ecore_x/xlib/ecore_x_e.c
	src/lib/ecore_x/xlib/ecore_x_selection.c
	src/lib/ecore_x/xlib/ecore_x_test.c
	src/lib/ecore_x/xlib/ecore_x_window.c
	src/lib/ecore_x/xlib/ecore_x_window_shape.c