roll back to before by solving conflict

git-svn-id: http://127.0.0.1/svn/testpro@30 c4902687-b1d5-40ba-b0ce-6735dcd7e6b0
Merge remote-tracking branch 'refs/remotes/trunk'