Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/home/settings into tizen_2.1

diff --cc setting-about/include/setting-about-main.h
Simple merge

diff --cc setting-about/src/setting-about-main.c
Simple merge

diff --cc setting-common/src/setting-common-data-slp-setting.c
Simple merge