[dali_1.1.17] Merge branch 'devel/master' 74/57174/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:22 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:22 +0000 (14:41 +0000)
Change-Id: I532bbd312d2aa765254447d39f87fc7203b8bc44


Trivial merge