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


Trivial merge