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


Trivial merge