b3522 -- refix refactoring

git-svn-id: http://farmanager.com/svn/trunk@10652 72235d2c-c60c-0410-a47a-a0032694dc5d
refix refix

git-svn-id: http://farmanager.com/svn/trunk@10654 72235d2c-c60c-0410-a47a-a0032694dc5d