Merge branch 'tizen_2.4' into tizen_2.3

Change-Id: Idf0299f92bea7a0836ede318e769ba0df76519a5
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

diff --cc data/device/abi.ini
index 048f85e,40407ed..048f85e
mode 100755,100644..100644
--- 1/data/device/abi.ini
--- 2/data/device/abi.ini
+++ b/data/device/abi.ini

diff --cc data/emulator/abi.ini
index 048f85e,40407ed..048f85e
mode 100755,100644..100644
--- 1/data/emulator/abi.ini
--- 2/data/emulator/abi.ini
+++ b/data/emulator/abi.ini

diff --cc packaging/data-provider-master.spec
index fd8ff27,4d9f2f2..1a03648
--- 1/packaging/data-provider-master.spec
--- 2/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@@ -2,10 -2,10 +2,10 @@@
  
  Name: data-provider-master
  Summary: Master service provider for widgetes
- Version: 1.1.5
+ Version: 1.1.6
  Release: 1
  Group: HomeTF/widget
 -License: Flora
 +License: Flora License, Version 1.1
  Source0: %{name}-%{version}.tar.gz
  Source1001: %{name}.manifest
  BuildRequires: cmake, gettext-tools, smack, coreutils