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


Trivial merge