[dali_1.0.51] Merge branch 'devel/master' 85/44985/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 30 Jul 2015 08:26:52 +0000 (09:26 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 30 Jul 2015 08:26:52 +0000 (09:26 +0100)
Change-Id: Iaee0259fba490e0d795b24b733014515ab23dc0b


Trivial merge