Elementary migration revision 69026

Merge remote-tracking branch 'remotes/origin/intefl/svn_merge'

Conflicts:
	src/lib/elm_index.c
	src/lib/elm_index.h
	src/lib/elm_label.c

diff --cc src/lib/elm_index.c
index 64c6ba6,7c142ac..abe4bdb
--- 1/src/lib/elm_index.c
--- 2/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@@ -1221,5 -982,4 +986,3 @@@ elm_index_horizontal_get(const Evas_Obj
     if (!wd) return EINA_FALSE;
     return wd->horizontal;
  }
- 
--

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