[dali_1.0.14] Merge branch 'tizen' 03/29203/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 22 Oct 2014 11:07:32 +0000 (12:07 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 22 Oct 2014 11:08:11 +0000 (12:08 +0100)
Change-Id: I6d5e5406bced1274c6cb285c78f83750593846e2


Trivial merge