[dali_1.0.31] Merge branch 'tizen' 63/35863/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 25 Feb 2015 11:33:43 +0000 (11:33 +0000)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 25 Feb 2015 11:33:43 +0000 (11:33 +0000)
Change-Id: I23375dbf1128aa5b1451900b3a5d773768df7640


Trivial merge