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


Trivial merge