- Fixed a warning GCC kept giving me when including mercenary.h
- Fixed a warning GCC kept giving me when including mercenary.h


git-svn-id: c1e39603916b71782cde5facdf0b79eff05c1414@8230 54d463be-8e91-2dee-dedb-b68131a5f0ec

Nipol/Siesta,Nipol/Siesta,Nipol/Siesta