[dali_1.0.45] Merge branch 'devel/master' 64/41864/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:15:00 +0000 (12:15 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:15:00 +0000 (12:15 +0100)
Change-Id: I73fe6b49c26c6bbb91b142f1e185941a12bac305


Trivial merge