[dali_1.0.17] Merge branch 'tizen' 70/30270/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:28:19 +0000 (11:28 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:28:35 +0000 (11:28 +0000)
Change-Id: I859f215053698ae32a68181dc77f5d4e8cacc4fc


Trivial merge