fix 610 patch
Merge branch 'master' of ssh://github.com/ooioe/OoliteV1trunk