[dali_1.1.14] Merge branch 'devel/master' 36/54136/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:17 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:17 +0000 (14:42 +0000)
Change-Id: Ibe79ddedb221ed2ff264f41fe3bc1c87d40730f3


Trivial merge