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


Trivial merge