[dali_1.0.49] Merge branch 'devel/master' 57/44157/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:12 +0000 (09:26 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:12 +0000 (09:26 +0100)
Change-Id: Ibce51e43c0f557cc08c63c943ab81e27b1b3664d


Trivial merge