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


Trivial merge