[dali_1.0.35] Merge branch 'tizen' 97/37397/1
authorTom Robinson <tom.robinson@samsung.com>
Wed, 25 Mar 2015 14:03:17 +0000 (14:03 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Wed, 25 Mar 2015 14:03:17 +0000 (14:03 +0000)
Change-Id: Ic7d40a30352fc67acc29857d8438acdc0f2bdcae


Trivial merge