[dali_1.0.12] Merge branch 'tizen' 01/28501/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:14:47 +0000 (11:14 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Oct 2014 10:15:19 +0000 (11:15 +0100)
Change-Id: I335c4b314dff18b6c3c47f176e0974b21e4368b6


Trivial merge