Migration with svn revision 66966 : solve conficts

diff --cc src/lib/canvas/evas_events.c
index ff48c42,0cd9212..c8242c1
--- 1/src/lib/canvas/evas_events.c
--- 2/src/lib/canvas/evas_events.c
+++ b/src/lib/canvas/evas_events.c
@@@ -906,15 -887,11 +906,10 @@@ evas_event_feed_mouse_out(Evas *e, unsi
     ev.modifiers = &(e->modifiers);
     ev.locks = &(e->locks);
     ev.timestamp = timestamp;
 -   ev.event_flags = EVAS_EVENT_FLAG_NONE;
 +   ev.event_flags = e->default_event_flags;
  
     _evas_walk(e);
- <<<<<<< HEAD
--   /* if our mouse button is grabbed to any objects */
--   if ((0) && (e->pointer.mouse_grabbed != 0))
- =======
 +   /* if our mouse button is inside any objects */
- >>>>>>> origin/upstream
       {
          /* go thru old list of in objects */
          Eina_List *l, *copy;
@@@ -932,11 -909,7 +927,7 @@@
                    if (!obj->delete_me)
                      {
                         if (e->events_frozen <= 0)
- <<<<<<< HEAD
--                          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
- =======
 +                         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
- >>>>>>> origin/upstream
                      }
                    obj->mouse_grabbed = 0;
                 }

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

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