From: so.yu <so.yu@samsung.com>
Date: Thu, 29 Aug 2013 10:33:16 +0000 (+0900)
Subject: Sync with tizen_2.2
X-Git-Tag: submit/tizen/20130829.121231^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1266a27e7741b4325b9b16c33508073fedd6a052;p=platform%2Fcore%2Fsecurity%2Flibcryptsvc.git

Sync with tizen_2.2

Conflicts:
	CMakeLists.txt
---

1266a27e7741b4325b9b16c33508073fedd6a052
diff --cc CMakeLists.txt
index e2a98f3,42153ee..5b53be4
mode 100644,100755..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt