[dali_1.0.3] Merge branch 'tizen' 18/25618/2
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:03:08 +0000 (11:03 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Thu, 7 Aug 2014 10:08:54 +0000 (03:08 -0700)
Change-Id: Ib27ca231ee092c33926b5f009e37d0285a37675b
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Trivial merge