[dali_1.0.41] Merge branch 'tizen' 99/39099/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 8 May 2015 12:52:40 +0000 (13:52 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 8 May 2015 12:52:40 +0000 (13:52 +0100)
Change-Id: I7afb808a65bc3dd9f685898a716bd9bbe2aa0f4c


Trivial merge