[dali_1.0.6] Merge branch 'tizen' 83/26683/1
authorNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:16:27 +0000 (17:16 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Wed, 27 Aug 2014 16:17:04 +0000 (17:17 +0100)
Change-Id: I16e1cdf0c497294381bf59e1baa6f2f304c75891


Trivial merge