Merge branch 'upstream' into tizen

Change-Id: Ic0156cc5b080beebbd2ee5fc34ebe8585c40cb8b

diff --cc Makefile
Simple merge

diff --cc gif2rgb.c
Simple merge

diff --cc gifbg.c
Simple merge

diff --cc gifbuild.c
Simple merge

diff --cc gifclrmp.c
Simple merge

diff --cc gifcolor.c
Simple merge

diff --cc gifecho.c
Simple merge

diff --cc giffix.c
Simple merge

diff --cc gifhisto.c
Simple merge

diff --cc gifinto.c
Simple merge

diff --cc giftext.c
Simple merge

diff --cc gifwedge.c
Simple merge