[dali_1.1.19] Merge branch 'devel/master' 48/58348/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:17 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:17 +0000 (11:34 +0000)
Change-Id: I48b20bc2e82d0e6ab23a5d3d8b1c3d14429edf6d


Trivial merge