merge fallout: Patched to compile, fixed some compiler warnings, etc.

--HG--
extra : amend_source : db5107c02c210087f25dea7f0407d09be10e24ba
6 files changed