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


Trivial merge