Merge branch 'master' of http://git.redump.net/mame into mamesvn
fixed compile errors caused by refactoring
Merge branch 'mamesvn' of https://github.com/oboewan42/frankenmame into mamesvn