Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary

diff --combined src/lib/elm_label.c
index 7ca2926,2fb0821..704f624
--- 1/src/lib/elm_label.c
--- 2/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@@ -364,7 -364,7 +364,7 @@@ _ellipsis_label_to_width(Evas_Object *o
     deffont = edje_object_data_get(wd->lbl, "default_font_size");
     if (deffont) cur_fontsize = atoi(deffont);
     else cur_fontsize = 1;
-    if (minfontsize == maxfontsize || cur_fontsize == 1) return; // theme is not ready for ellipsis
+    if (minfontsize > maxfontsize || cur_fontsize == 1) return; // theme is not ready for ellipsis
     if (eina_stringshare_strlen(wd->label) <= 0) return;
  
     if (_get_value_in_key_string(wd->label, "font_size", &kvalue) == 0)
@@@ -664,7 -664,7 +664,7 @@@ elm_label_fontsize_set(Evas_Object *obj
   * Set the text align on the label object
   *
   * @param obj The label object
 - * @param align align mode
 + * @param align align mode ("left", "center", "right")
   *
   * @ingroup Label
   */