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


Trivial merge