[dali_1.0.6] Merge branch 'tizen' 87/26687/1
authorNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:29:09 +0000 (17:29 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:33:25 +0000 (17:33 +0100)
Change-Id: Id69c5d62ff17fae60f2e4e10e993efbf4cda24ba


Trivial merge