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


Trivial merge