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


Trivial merge