[dali_1.0.26] Merge branch 'tizen' 56/34256/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:48:52 +0000 (10:48 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:48:52 +0000 (10:48 +0000)
Change-Id: I411d40108033a927691c31f73de76fc6d8eeb47b


Trivial merge