merge conflict

git-svn-id: https://git-svn-jktest.googlecode.com/svn/trunk@19 852af8d6-67a7-25c9-60ec-8f736d4f3156
merge conflict

git-svn-id: https://git-svn-jktest.googlecode.com/svn/trunk@20 852af8d6-67a7-25c9-60ec-8f736d4f3156