[dali_1.0.43] Merge branch 'tizen' 93/40493/1
authorRichard Huang <r.huang@samsung.com>
Thu, 4 Jun 2015 10:06:32 +0000 (11:06 +0100)
committerRichard Huang <r.huang@samsung.com>
Thu, 4 Jun 2015 10:06:32 +0000 (11:06 +0100)
Change-Id: I4ae07c3cf1fea66f5017b3a74253ae60d0e8b261


Trivial merge