[dali_1.0.4] Merge branch 'tizen' 91/25991/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:21:10 +0000 (15:21 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:22:46 +0000 (15:22 +0100)
Change-Id: Ifb4f958c2b6803cad3c0867571820df80e6c1108


Trivial merge