[dali_1.1.39] Merge branch 'devel/master' 27/75327/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:43:56 +0000 (11:43 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:43:56 +0000 (11:43 +0100)
Change-Id: Iab0c10c304ebbf546ce962b49dde50631f463648


Trivial merge