Merge remote-tracking branch 'origin/upstream'

Conflicts:
	src/lib/Edje.h
	src/lib/edje_entry.c
	src/lib/edje_private.h
	src/lib/edje_util.c

diff --cc src/bin/edje_cc_handlers.c
Simple merge

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

diff --cc src/lib/edje_calc.c
Simple merge

diff --cc src/lib/edje_entry.c
index 63463b7,a39d8e1..5d857e3
--- 1/src/lib/edje_entry.c
--- 2/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@@ -2158,16 -1780,10 +2161,16 @@@ _edje_part_mouse_down_cb(void *data, Ev
          _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
       }
     evas_textblock_cursor_free(tc);
-    
+ 
     _edje_entry_imf_cursor_info_set(en);
  
 -   _edje_entry_real_part_configure(rp);
 +   if (en->rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_BLOCK_HANDLE)
 +     {
 +        if (en->longpress_timer) ecore_timer_del(en->longpress_timer);
 +        en->longpress_timer = ecore_timer_add(1.0, _long_press, data);
 +     }
 +   else
 +      _edje_entry_real_part_configure(rp);
     if (ev->button == 2)
       {
          _edje_emit(rp->edje, "entry,paste,request", rp->part->name);

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

diff --cc src/lib/edje_util.c
Simple merge