[dali_1.1.1] Merge branch 'devel/master' 24/46824/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:26 +0000 (11:15 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:26 +0000 (11:15 +0100)
Change-Id: Ie82817e14cd7ae8a260538acd8b7c9584675f27e


Trivial merge