From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Wed, 11 Jun 2014 07:46:30 +0000 (+0100)
Subject: Merge branch 'master' into tizen
X-Git-Tag: dali_1.0.0~87
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=00ef589046a32c53d20de1c61af7cc69524e51dc

Merge branch 'master' into tizen
---

00ef589046a32c53d20de1c61af7cc69524e51dc