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


Trivial merge