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


Trivial merge