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

Trivial merge