[dali_1.0.22] Merge branch 'tizen' 70/32470/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:10:12 +0000 (10:10 +0000)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:10:13 +0000 (10:10 +0000)
Change-Id: I45f858bd9b4673e19a1dc85dcc29f272c56ea4f1


Trivial merge