Merge changes I0e3d27e9,I21982ac9
authordeasung.kim <deasung.kim@samsung.com>
Thu, 26 May 2011 06:15:42 +0000 (15:15 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 26 May 2011 06:15:42 +0000 (15:15 +0900)
commitf559a93d52e28764a119bcc8510d61a38f33b18f
tree4b2707b6f66802e11181114c6b6db08eed296797
parent72a456e983977ceca72cae775bcce3dcfa72de82
parent0e3d27e95e47a1cea894a266bd61d1929fe765d1
Merge changes I0e3d27e9,I21982ac9

* changes:
  [elm_cnp_helper.c] add convert from html tag to efl tag
  [elm_cnp_helper.c] add convert from efl tag to html tag