Merge branch 'upstream'

Conflicts:
	src/lib/ecore_evas/ecore_evas_private.h

diff --cc src/lib/ecore_evas/ecore_evas_private.h
index a5df911,e662048..93948a7
--- 1/src/lib/ecore_evas/ecore_evas_private.h
--- 2/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@@ -350,9 -358,12 +358,13 @@@ struct _Ecore_Eva
     unsigned char registered : 1;
     unsigned char no_comp_sync  : 1;
     unsigned char semi_sync  : 1;
+    unsigned char deleted : 1;
 +   int           gl_sync_draw_done; // added by gl77.lee
  };
  
+ void _ecore_evas_ref(Ecore_Evas *ee);
+ void _ecore_evas_unref(Ecore_Evas *ee);
+ 
  #ifdef BUILD_ECORE_EVAS_X11
  int _ecore_evas_x_shutdown(void);
  #endif

diff --cc src/lib/ecore_evas/ecore_evas_x.c
Simple merge