[dali_1.0.1] Merge branch 'tizen' 78/24978/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 13:57:14 +0000 (14:57 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 13:57:25 +0000 (14:57 +0100)
Change-Id: I2cba730d1b96f5cd04bd53b2946b624837de6be1


Trivial merge