Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:56:03 +0000 (12:56 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:56:03 +0000 (12:56 +0000)
commit05ba3482501f2dc9d5e40ecdfff509e89f3936a7
treec18755788887f15f6dfdd6e532aa1d90283254ef
parente5bd5d2e10a9cb6d56042ae46eb112718badf901
parent29c2552f4a8ca6ef9cb38910c22a0ffe2e03d271
Merge branch 'master' into tizen_2.1

Conflicts:
include/conf.h
packaging/org.tizen.data-provider-slave.spec
src/conf.c

Change-Id: I9463462acc0442cafabb038a016b4ac8c7bf1d6f