for some compilers, assert != terminate... fixup make_enum
Merge branch 'master' of git://github.com/wesnoth/wesnoth