[dali_1.1.10] Merge branch 'devel/master' 73/51773/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:03 +0000 (16:34 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:03 +0000 (16:34 +0000)
Change-Id: Idbacb1d4b947cb0a22af84a142c0d641a87ec45a


Trivial merge