Merge branches 'ns9x' and 'machtypes' into devel

This commit is contained in:
Russell King 2008-07-07 16:26:41 +01:00 • committed by Russell King
4 changed files with 151 additions and 64 deletions