[crossfire] sync to refactoring of crossfire into client and server
[crossfire] sync to refactoring of crossfire into client and server

http://code.google.com/p/fbug/source/detail?r=9112

mrennie/crossfire,mrennie/crossfire,mrennie/crossfire