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


Trivial merge