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


Trivial merge