[dali_1.0.23] Merge branch 'tizen' 14/32814/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 24 Dec 2014 10:44:28 +0000 (10:44 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 24 Dec 2014 10:44:28 +0000 (10:44 +0000)
Change-Id: I4b7afbda152617554d6b0e8301f0e9bae443e9bc


Trivial merge