[dali_1.1.19] Merge branch 'devel/master' 46/58346/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:02 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:02 +0000 (11:34 +0000)
Change-Id: I76c294380fcff7f3f4d4db081441e7df51d7dfce


Trivial merge