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


Trivial merge