Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta
authorHyejin Kim <hyejin0906.kim@tizendev.org>
Wed, 5 Sep 2012 07:02:40 +0000 (16:02 +0900)
committerGerrit Code Review <gerrit2@localhost>
Wed, 5 Sep 2012 07:02:40 +0000 (16:02 +0900)
commit33f08dacc68a209907e727db476df39d979f8c05
tree21c8b21ec271be5b774e3e45b25fab006179ac33
parentc35af098e3c887695db0d7d503c3a2169ecfc394
parentb078734a6a8edb231e47ced94d46f2bead2efd5e
Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta