[dali_1.0.3] Merge branch 'tizen' 19/25619/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:06:15 +0000 (11:06 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:06:23 +0000 (11:06 +0100)
Change-Id: Iaf545a4dd5e0add70040c7249b4e7f4c32d3ab4c
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Trivial merge