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


Trivial merge