[dali_1.0.38] Merge branch 'tizen' 62/38262/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 15 Apr 2015 11:58:15 +0000 (12:58 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 15 Apr 2015 11:58:15 +0000 (12:58 +0100)
Change-Id: I9d40a04edbd9f8099a199e547c3ab802ea7909af


Trivial merge