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


Trivial merge