From: MyoungJune Park <mj2004.park@samsung.com>
Date: Sat, 8 Sep 2012 04:45:04 +0000 (+0900)
Subject: Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta
X-Git-Tag: 2.0_alpha~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12f81dd4e585b8f6c23c589a172b5813d45ed43f;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta

Conflicts:
	src/setting-main.c
---

12f81dd4e585b8f6c23c589a172b5813d45ed43f