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


Trivial merge