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


Trivial merge