[dali_1.0.10] Merge branch 'tizen' 76/28076/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:01:26 +0000 (16:01 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:06:48 +0000 (16:06 +0100)
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: I4fe15a7e78ba074ed6c2f673616a8d1ff53c8b5b
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge