[dali_1.0.3] Merge branch 'tizen' 21/25621/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:05:09 +0000 (11:05 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:05:29 +0000 (11:05 +0100)
Change-Id: I2fdaee520c05b07783c08691c11b8ca780b4d620
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Trivial merge