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


Trivial merge