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


Trivial merge