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


Trivial merge