[dali_1.1.39] Merge branch 'devel/master' 28/75328/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:07 +0000 (11:44 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:07 +0000 (11:44 +0100)
Change-Id: I9abdb89a2a9727dbd4b27cfaffc15a4c68d499dd


Trivial merge