Merge branch 'devel/master' into tizen

Change-Id: I50ca6d48924cfb2af3713a158c05fb44f2bf3fad

diff --cc packaging/dali.spec
index 26c6043,e476f5a..e400e27
--- 1/packaging/dali.spec
--- 2/packaging/dali.spec
+++ b/packaging/dali.spec
@@@ -88,10 -88,12 +88,13 @@@ LDFLAGS="${LDFLAGS:-%optflags}" ; expor
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --enable-gles=%{target_gles_version} \
+ %if 0%{?enable_debug}
+       --enable-debug \
+ %endif
        --infodir=%{_infodir}
  
 -make %{?jobs:-j%jobs}
 +#make %{?jobs:-j%jobs}
 +make
  
  ##############################
  # Installation