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


Trivial merge