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


Trivial merge