[dali_1.0.20] Merge branch 'tizen' 86/31286/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:35:04 +0000 (12:35 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:43:30 +0000 (12:43 +0000)
Change-Id: I5f4224f62416f8c0cf7a462394816fb00cabee9c


Trivial merge