[dali_1.0.14] Merge branch 'tizen' 96/29196/1 dali_1.0.14
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 22 Oct 2014 11:01:10 +0000 (12:01 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 22 Oct 2014 11:03:42 +0000 (12:03 +0100)
Change-Id: I3acea77848392bf9e8d112a327074cfec3c67cff


Trivial merge