[dali_1.0.52] Merge branch 'devel/master' 70/45470/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 6 Aug 2015 10:05:54 +0000 (11:05 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 6 Aug 2015 10:05:54 +0000 (11:05 +0100)
Change-Id: Ibc6f21aade9b4f0b65758d5fd910216ff6d246ec


Trivial merge