Merge "fix prevent defect. 35690, 35689, 23539, 23538"
authorJaeyun Jeong <jyjeong@tizendev.org>
Tue, 8 Jan 2013 11:48:46 +0000 (20:48 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 8 Jan 2013 11:48:46 +0000 (20:48 +0900)

Trivial merge