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


Trivial merge