[dali_1.1.17] Merge branch 'devel/master' 75/57175/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:29 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:29 +0000 (14:41 +0000)
Change-Id: I830f119bf1dd9368a47e9f4095cd36b3eaacd420


Trivial merge