[dali_1.1.4] Merge branch 'devel/master' 17/48717/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:35 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:35 +0000 (08:46 +0100)
Change-Id: I7d620bb95b904588ad20fa2f4aea5264aee868aa


Trivial merge