[dali_1.0.5] Merge branch 'tizen' 24/26324/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 14:06:35 +0000 (15:06 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 14:09:14 +0000 (15:09 +0100)
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: Ib4001d8f81d0c994a1eae038435605299d1803bb
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge