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


Trivial merge