Merge branch 'tizen_3.0' into tizen

Change-ID: I364987d6b02d4538753a9b924fbd6769878510b3
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --cc CMakeLists.txt
index e16df2d,64c56f9..64c56f9
mode 100755,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt

diff --cc packaging/sdbd.spec
Simple merge

diff --cc src/sdb.c
index a07a881,5c6b2d5..5c6b2d5
mode 100755,100644..100755
--- 1/src/sdb.c
--- 2/src/sdb.c
+++ b/src/sdb.c

diff --cc src/sdb.h
index 226da64,0fe7005..0fe7005
mode 100755,100644..100755
--- 1/src/sdb.h
--- 2/src/sdb.h
+++ b/src/sdb.h

diff --cc src/sdbd_plugin.h
index e98ef69,0a9287a..0a9287a
mode 100755,100644..100755
--- 1/src/sdbd_plugin.h
--- 2/src/sdbd_plugin.h
+++ b/src/sdbd_plugin.h

diff --cc src/transport.c
index 7811628,8d889e3..8d889e3
mode 100755,100644..100755
--- 1/src/transport.c
--- 2/src/transport.c
+++ b/src/transport.c