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


Trivial merge