[dali_1.1.9] Merge branch 'devel/master' 10/51310/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 6 Nov 2015 10:37:17 +0000 (10:37 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 6 Nov 2015 10:37:17 +0000 (10:37 +0000)
Change-Id: If6ccd3299a3412e6cfd39d00d94d74dbce5ab6e5


Trivial merge