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


Trivial merge