Merge "Fix N_SE-8316,N_SE-5455" into 2.0_beta
authorkairong yin <kairong78.yin@tizendev.org>
Mon, 3 Sep 2012 06:40:55 +0000 (15:40 +0900)
committerGerrit Code Review <gerrit2@localhost>
Mon, 3 Sep 2012 06:40:55 +0000 (15:40 +0900)

Trivial merge