[dali_1.1.34] Merge branch 'devel/master' 00/69500/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:29 +0000 (11:55 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:29 +0000 (11:55 +0100)
Change-Id: Ic465b246b9d29bf5d46aea73e10b9286d780c7c5


Trivial merge