[dali_1.0.30] Merge branch 'tizen' 83/35583/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 18 Feb 2015 14:34:19 +0000 (14:34 +0000)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 18 Feb 2015 14:34:19 +0000 (14:34 +0000)
Change-Id: I873e73f33acfd8ec6562610bbc2e6f5b81e522c4


Trivial merge