Merge branch 'upstream' into tizen

diff --cc autogen.sh
index 3e7c49b,78053cc..efac6e7
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh
@@@ -153,10 -153,9 +153,9 @@@ sed -e "s;@VERSION@;$freetype_major$fre
    < configure.raw > configure.ac
  
  run aclocal -I . --force
 -run $LIBTOOLIZE --force --copy --install
 +run $LIBTOOLIZE --force --copy
  run autoconf --force
  
- chmod +x mkinstalldirs
  chmod +x install-sh
  
  cd ../..

diff --cc src/base/ftobjs.c
Simple merge

diff --cc src/pcf/pcfread.c
Simple merge