[dali_1.0.26] Merge branch 'tizen' 58/34258/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:08 +0000 (10:49 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:08 +0000 (10:49 +0000)
Change-Id: Ibf0f060faa8b643b65f5cc0cbb63b96819a98dac


Trivial merge