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


Trivial merge