[dali_1.1.27] Merge branch 'devel/master' 90/63590/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:47 +0000 (15:49 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:47 +0000 (15:49 +0000)
Change-Id: I7f014ed999b240cbc5fd4993206c70c6c8150ec9


Trivial merge