[dali_1.0.5] Merge branch 'tizen' 25/26325/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 14:07:49 +0000 (15:07 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 14:07:53 +0000 (15:07 +0100)
Change-Id: I01b742a6830b11215f770b15213a37f4435aa210
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Trivial merge