[dali_1.0.41] Merge branch 'tizen' 09/39109/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 8 May 2015 13:15:06 +0000 (14:15 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 8 May 2015 13:24:39 +0000 (14:24 +0100)
Change-Id: I5ed50dd8faa1c132908926253f5dfdad40b2564a


Trivial merge