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


Trivial merge