[dali_1.0.37] Merge branch 'tizen' 86/38086/1
authorKingsley Stephens <k.stephens@samsung.com>
Fri, 10 Apr 2015 14:36:14 +0000 (15:36 +0100)
committerKingsley Stephens <k.stephens@samsung.com>
Fri, 10 Apr 2015 14:36:14 +0000 (15:36 +0100)
Change-Id: Ibae4f16083c08db218e766a8707b40548f5d6a95


Trivial merge