[dali_1.1.35] Merge branch 'devel/master' 55/70755/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:03 +0000 (11:18 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:03 +0000 (11:18 +0100)
Change-Id: Ic0491ebd32f324c1841b86eda9901022b558261b


Trivial merge