Merge remote-tracking branch 'origin/tizen_4.0' into tizen

Change-Id: I75d6c2cf7a89051293838f20e440a0049790975d
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --cc packaging/capi-system-info.spec
index 7ec6d3704f697b84f992909063a68befabd57532,7ec6d3704f697b84f992909063a68befabd57532..75521b96d7663a315901f3793c42fded9bbc4fa0
--- 1/packaging/capi-system-info.spec
--- 2/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define config_file_path %{_sysconfdir}/config/model-config.xml
  
  Name:           capi-system-info
--Version:        0.2.1
--Release:        2
++Version:        0.5
++Release:        1
  License:        Apache-2.0
  Summary:        A System Information library in Core API
  Group:          System/API

diff --cc src/init_db/system_info_db_init.c
Simple merge