[dali_1.0.42] Merge branch 'tizen' 10/40110/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2015 08:01:42 +0000 (09:01 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2015 08:01:42 +0000 (09:01 +0100)
Change-Id: I8fe63ef577a7d6d3526d6dada49f8577306c4415


Trivial merge