[dali_1.0.10] Merge branch 'tizen' 75/28075/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 14:59:28 +0000 (15:59 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:05:36 +0000 (16:05 +0100)
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: I53e5b3499a07bba7e3ae99b11efbb1f9fd29d342
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge