[dali_1.0.51] Merge branch 'devel/master' 87/44987/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 30 Jul 2015 08:27:05 +0000 (09:27 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 30 Jul 2015 08:27:05 +0000 (09:27 +0100)
Change-Id: I2c1ef261114272200d4f1b12d8df32cac6ee6bc1


Trivial merge