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


Trivial merge