[dali_1.1.2] Merge branch 'devel/master' 65/47965/1
authorRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:05:55 +0000 (11:05 +0100)
committerRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:05:55 +0000 (11:05 +0100)
Change-Id: I317675a6ab0e39a31f265800b51c1849fed8a28c


Trivial merge