From: js411.kim <js411.kim@samsung.com>
Date: Tue, 11 Jun 2013 10:30:31 +0000 (+0900)
Subject: Merge branch 'tizen_2.1' into tizen_2.2
X-Git-Tag: submit/tizen_2.2/20130714.152527
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_2.2%2F20130714.152527;p=apps%2Fhome%2Fmemo.git

Merge branch 'tizen_2.1' into tizen_2.2
---

5b6fe0fa64aa822f2b64b30984f0980fa0a4e18f