[dali_1.0.21] Merge branch 'tizen' 80/31880/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:57 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:57 +0000 (15:02 +0000)
Change-Id: I4cf0e47c2c831e78c51e4d3e75b804e6d08cc4ef


Trivial merge