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


Trivial merge