[dali_1.0.12] Merge branch 'tizen' 00/28500/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:14:28 +0000 (11:14 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:15:18 +0000 (11:15 +0100)
Change-Id: I7668aa8c3d852ae7d943161359e6eeda1f4aa91e


Trivial merge