merged the changes of remod r402

http://code.google.com/p/remod-sauerbraten/source/detail?r=402