[dali_1.1.14] Merge branch 'devel/master' 37/54137/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:22 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:22 +0000 (14:42 +0000)
Change-Id: I807fff98f63889278c380e8d8f65a566b1408a12


Trivial merge