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


Trivial merge