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


Trivial merge