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


Trivial merge