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


Trivial merge