[dali_1.0.9] Merge branch 'tizen' 61/27761/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Sep 2014 14:08:44 +0000 (15:08 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Sep 2014 14:08:49 +0000 (15:08 +0100)
Change-Id: I74797563e5a286172ea8f1679bc7566180a6e506


Trivial merge