[dali_1.0.22] Merge branch 'tizen' 68/32468/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:09:58 +0000 (10:09 +0000)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:09:58 +0000 (10:09 +0000)
Change-Id: I094c2d29b19ccdae6cfdaefeae4054187f115c3d


Trivial merge