From: MyoungJune Park <mj2004.park@samsung.com>
Date: Tue, 26 Mar 2013 02:06:11 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: submit/tizen_2.1/20130424.230627~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c99f01c85522940a6bb84066b3fe4fa5f280aa4;p=platform%2Fcore%2Fapi%2Fsystem-settings.git

Merge branch 'master' into tizen_2.1

Conflicts:
	TC_gui/main.c
	capi-system-system-settings.pc.in
	debian/changelog
	packaging/capi-system-system-settings.spec
	src/system_setting_platform.c
---

5c99f01c85522940a6bb84066b3fe4fa5f280aa4