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


Trivial merge