[dali_1.0.1] Merge branch 'tizen' 67/24967/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 12:55:36 +0000 (13:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 12:59:22 +0000 (13:59 +0100)
Change-Id: I39d63adc17305ee7feb853820e3c13216021261a


Trivial merge