[dali_1.0.16] Merge branch 'tizen' 69/29969/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 6 Nov 2014 08:21:32 +0000 (08:21 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 6 Nov 2014 08:21:35 +0000 (08:21 +0000)
Change-Id: Ia8333d5a1cedd5d7ec3078cf368ca345be0e93fa


Trivial merge