[dali_1.0.9] Merge branch 'tizen' 60/27760/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Sep 2014 14:08:04 +0000 (15:08 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Sep 2014 14:08:09 +0000 (15:08 +0100)
Change-Id: Ifb019788135561ef1448b6ee4ebd89e1cd2bdc47


Trivial merge