[dali_1.0.44] Merge branch 'devel/master' 49/41149/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 11 Jun 2015 09:46:28 +0000 (10:46 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 11 Jun 2015 09:46:28 +0000 (10:46 +0100)
Change-Id: I190316c1498689334ffafec19a4891e68190cec1


Trivial merge