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


Trivial merge