[dali_1.0.42] Merge branch 'tizen' 13/40113/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2015 08:05:30 +0000 (09:05 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2015 08:13:27 +0000 (09:13 +0100)
Change-Id: I7979db78102e0fc32016e67648e253adc378ccee


Trivial merge