[dali_1.2.1] Merge branch 'devel/master' 49/83849/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:26 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:26 +0000 (11:41 +0100)
Change-Id: I09bc8c2b6dcdb5ff4d3e9e5252a5f285c9908c96


Trivial merge