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


Trivial merge