[dali_1.0.47] Merge branch 'devel/master' 96/42696/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:04 +0000 (14:19 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:04 +0000 (14:19 +0100)
Change-Id: Ia4e16d5765c0e822b3291feafcc0022dff400d0d


Trivial merge