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


Trivial merge