[dali_1.0.10] Merge branch 'tizen' 78/28078/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:04:32 +0000 (16:04 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 25 Sep 2014 15:07:49 +0000 (16:07 +0100)
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: Ia01dce54b6f24b0833566e386807dab5ea1e8651
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge