[dali_1.0.20] Merge branch 'tizen' 88/31288/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:39:28 +0000 (12:39 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:45:15 +0000 (12:45 +0000)
Change-Id: I0bb760fb0ee2d83c5b47ebfb8c55c471b2d49bc3


Trivial merge