[dali_1.1.28] Merge branch 'devel/master' 53/64453/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 1 Apr 2016 08:33:50 +0000 (09:33 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 1 Apr 2016 08:36:53 +0000 (09:36 +0100)
Change-Id: Id3ae12681e5204a192924496b764dd004a7c1634


Trivial merge