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


Trivial merge