[dali_1.0.17] Merge branch 'tizen' 67/30267/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:29:30 +0000 (11:29 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:39:31 +0000 (11:39 +0000)
Change-Id: I4808a57c41d94af0b92e06679d22d8a88ff18494


Trivial merge