[dali_1.0.52] Merge branch 'devel/master' 73/45473/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 6 Aug 2015 10:06:14 +0000 (11:06 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 6 Aug 2015 10:06:14 +0000 (11:06 +0100)
Change-Id: Ia13a95fcd42557640732f7f956ce95e64d9ad163


Trivial merge