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)

Trivial merge