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


Trivial merge