[dali_1.0.47] Merge branch 'devel/master' 94/42694/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:18:59 +0000 (14:18 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:18:59 +0000 (14:18 +0100)
Change-Id: I95ba94a2065d39d1eb479e19f463b303ac6d605b


Trivial merge