[dali_1.1.8] Merge branch 'devel/master' 12/50512/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:18 +0000 (10:32 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:18 +0000 (10:32 +0000)
Change-Id: I4c439af8c8919e8bdae55fa19273508035212510


Trivial merge