[dali_1.0.29] Merge branch 'tizen' 70/35270/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Feb 2015 10:13:39 +0000 (10:13 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Feb 2015 10:13:40 +0000 (10:13 +0000)
Change-Id: I553e66ceb905e7f3b01896e9ba725e5fe3cddf9c


Trivial merge