[dali_1.0.13] Merge branch 'tizen' 69/28769/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 15 Oct 2014 13:16:50 +0000 (14:16 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 15 Oct 2014 13:18:40 +0000 (14:18 +0100)
Change-Id: I67922fe55c4ac8eb55ffcc6dbad0222d107610d6


Trivial merge