From: MyoungJune Park <mj2004.park@samsung.com>
Date: Wed, 10 Apr 2013 08:42:35 +0000 (+0900)
Subject: Merge commit 'refs/changes/80/59380/1' of ssh://tizendev.org:29418/framework/api... 
X-Git-Tag: submit/tizen_2.1/20130424.230627^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71794764e21ad92ca0103e3338ee7ad01a60a9af;p=platform%2Fcore%2Fapi%2Fsystem-settings.git

Merge commit 'refs/changes/80/59380/1' of ssh://tizendev.org:29418/framework/api/system-settings

Conflicts:
	TC_gui/main.c
---

71794764e21ad92ca0103e3338ee7ad01a60a9af