[dali_1.0.29] Merge branch 'tizen' 68/35268/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Feb 2015 10:13:34 +0000 (10:13 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Feb 2015 10:13:34 +0000 (10:13 +0000)
Change-Id: I7e905280c34b2f4b207671972bb7815cfacfd602


Trivial merge