[dali_1.0.4] Merge branch 'tizen' 88/25988/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:20:51 +0000 (15:20 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:21:47 +0000 (15:21 +0100)
Change-Id: I238d93e3ff4d608659da36863312992e0cd82f17


Trivial merge