From: Boram Park <boram1288.park@samsung.com>
Date: Wed, 30 Jul 2014 09:11:29 +0000 (+0900)
Subject: Merge branch 'devel/x11' into tizen
X-Git-Tag: accepted/tizen/3.0/common/20161114.110544^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Ffontsproto.git;a=commitdiff_plain;h=HEAD

Merge branch 'devel/x11' into tizen

Change-Id: Ia0352afb8d24323fca5f9c4ead12c905ce9ba9e7
---

ce71f03f8451f7b98dca7b926bb94dc7b4d48506