[dali_1.1.7] Merge branch 'devel/master' 39/50039/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:59 +0000 (11:00 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:01:00 +0000 (11:01 +0100)
Change-Id: I51e2dd26cb5e210757d50acdfe40e664cc572206


Trivial merge