[dali_1.1.7] Merge branch 'devel/master' 37/50037/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:51 +0000 (11:00 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:51 +0000 (11:00 +0100)
Change-Id: I2205465952bf5d181fe2452651e16707768db7fb


Trivial merge