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


Trivial merge