Merge "DALi Version 1.0.4" into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 13 Aug 2014 15:36:57 +0000 (08:36 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 13 Aug 2014 15:36:57 +0000 (08:36 -0700)

Trivial merge