[dali_1.0.50] Merge branch 'devel/master' 86/44586/1
authorRichard Huang <r.huang@samsung.com>
Thu, 23 Jul 2015 10:56:35 +0000 (11:56 +0100)
committerRichard Huang <r.huang@samsung.com>
Thu, 23 Jul 2015 10:56:35 +0000 (11:56 +0100)
Change-Id: If0ae1bc5fe11a0da9d14f5e8cf31ebc8d7fdbd2b


Trivial merge