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


Trivial merge