[dali_1.0.27] Merge branch 'tizen' 02/34602/1
authortom.robinson <tom.robinson@samsung.com>
Thu, 29 Jan 2015 10:59:52 +0000 (10:59 +0000)
committertom.robinson <tom.robinson@samsung.com>
Thu, 29 Jan 2015 10:59:52 +0000 (10:59 +0000)
Change-Id: I2fd7c581e631cd50e287451e7bc8f789eb8104a8


Trivial merge