[dali_1.0.6] Merge branch 'tizen' 84/26684/1
authorNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:17:37 +0000 (17:17 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:30:18 +0000 (17:30 +0100)
Change-Id: Ic69941959efe20002d53e30d5967b76f1e13b164


Trivial merge