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


Trivial merge