[dali_1.0.10] Merge branch 'tizen' 77/28077/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:02:26 +0000 (16:02 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:07:20 +0000 (16:07 +0100)
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: I955f6ebf6bb45334f197536029d2dd8471c02369
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge