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


Trivial merge