[dali_1.0.12] Merge branch 'tizen' 02/28502/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:14:52 +0000 (11:14 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:15:21 +0000 (11:15 +0100)
Change-Id: I381063525435169d9c23d501b3bf8516ec865091


Trivial merge