Merge branch 'tizen' into sandbox/srk/hwc

diff --cc src/bin/e_comp_object.c
Simple merge

diff --cc src/bin/e_comp_screen.c
Simple merge

diff --cc src/bin/e_info_client.c
Simple merge

diff --cc src/bin/e_info_server.c
Simple merge