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


Trivial merge