[dali_1.0.16] Merge branch 'tizen' 68/29968/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 6 Nov 2014 08:21:23 +0000 (08:21 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 6 Nov 2014 08:21:27 +0000 (08:21 +0000)
Change-Id: Icf4a5284130bc9c09908d4c4695e42a544358f8b


Trivial merge