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


Trivial merge