Merge branch 'upstream'

Conflicts:
	src/lib/canvas/evas_events.c
	src/lib/canvas/evas_object_main.c
	src/lib/canvas/evas_object_textblock.c
	src/modules/engines/gl_x11/evas_engine.c
	src/modules/loaders/gif/evas_image_load_gif.c
	src/modules/loaders/jpeg/evas_image_load_jpeg.c

diff --cc configure.ac
Simple merge

diff --cc src/lib/Evas.h
Simple merge

diff --cc src/lib/cache/evas_cache_image.c
index c6ab7bb,d52c64e..ec4331f
mode 100755,100644..100755
--- 1/src/lib/cache/evas_cache_image.c
--- 2/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c

diff --cc src/lib/canvas/evas_events.c
index eff4fa1,33b5015..0e3faa3
--- 1/src/lib/canvas/evas_events.c
--- 2/src/lib/canvas/evas_events.c
+++ b/src/lib/canvas/evas_events.c
@@@ -445,16 -448,19 +448,19 @@@ evas_event_feed_mouse_up(Evas *e, int b
          ERR("BUG? e->pointer.mouse_grabbed (=%d) < 0!",
              e->pointer.mouse_grabbed);
       }
 -/* don't need this anymore - havent actually triggered this for a long
 - * time and this also doesn't account for multitouch, so leave here if we
 - * ever find bugs again so we can turn it on, but otherwise.. dont use this
 -   if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0))
 -     {
 -        INF("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed);
 -      e->pointer.mouse_grabbed = 0;
 -     }
 - */
 +   /* don't need this anymore - havent actually triggered this for a long
 +    * time and this also doesn't account for multitouch, so leave here if we
 +    * ever find bugs again so we can turn it on, but otherwise.. dont use this
 +    if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0))
 +    {
 +    INF("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed);
 +    e->pointer.mouse_grabbed = 0;
 +    }
 +    */
     _evas_unwalk(e);
+ 
+    /* process mouse up for touch */
+    _evas_event_touch_up(e, e->pointer.x, e->pointer.y, 0, timestamp);
  }
  
  EAPI void
@@@ -1028,8 -1040,11 +1040,11 @@@ evas_event_feed_multi_up(Evas *e
       }
     if (copy) copy = eina_list_free(copy);
     if ((e->pointer.mouse_grabbed == 0) && !_post_up_handle(e, timestamp, data))
 -      _evas_post_event_callback_call(e);
 +     _evas_post_event_callback_call(e);
     _evas_unwalk(e);
+ 
+    /* process multi up for touch */
+    _evas_event_touch_up(e, x, y, d, timestamp);
  }
  
  EAPI void

diff --cc src/lib/canvas/evas_object_main.c
Simple merge

diff --cc src/lib/include/evas_common.h
Simple merge

diff --cc src/modules/engines/gl_common/evas_gl_shader.c
Simple merge

diff --cc src/modules/engines/gl_common/evas_gl_texture.c
Simple merge

diff --cc src/modules/engines/gl_x11/evas_engine.c
Simple merge

diff --cc src/modules/loaders/gif/evas_image_load_gif.c
Simple merge