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


Trivial merge