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


Trivial merge