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


Trivial merge