[dali_1.0.46] Merge branch 'devel/master' 37/42237/1
authorChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:49 +0000 (15:54 +0100)
committerChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:49 +0000 (15:54 +0100)
Change-Id: Id16ef6d81fb4ae2e54dfb00df78f9ff3244c4381


Trivial merge