[dali_1.1.25] Merge branch 'devel/master' 77/61977/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:02:58 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:02:58 +0000 (15:02 +0000)
Change-Id: Iee2438bfeaee5afb254db11731fe6f1a2c5a0db7


Trivial merge