From: MyoungJune Park <mj2004.park@samsung.com>
Date: Mon, 15 Apr 2013 05:44:06 +0000 (+0900)
Subject: Merge "Merge branch 'master' into tizen_2.1" into tizen_2.1
X-Git-Tag: accepted/tizen_2.1/20130425.022820~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=927b3ba500196e340e5279a73596d98d13355781;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

Merge "Merge branch 'master' into tizen_2.1" into tizen_2.1
---

927b3ba500196e340e5279a73596d98d13355781