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


Trivial merge