Merge "[Bug] Fix P121016-7262 and P121015-5401 ."
authorJing Yigang <yigang.jing@tizendev.org>
Fri, 19 Oct 2012 01:40:08 +0000 (10:40 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 19 Oct 2012 01:40:08 +0000 (10:40 +0900)

Trivial merge