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


Trivial merge