[dali_1.1.6] Merge branch 'devel/master' 35/49235/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:17 +0000 (10:49 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:17 +0000 (10:49 +0100)
Change-Id: I1d00c300da2b1b3fd986f4752a7a4d8531ffb576


Trivial merge