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


Trivial merge