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


Trivial merge