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


Trivial merge