Changed id(s) of type short to type int, since this will give us a higher range of id(s).
Authored by: SumolX 2009-04-07
Parent: [r2213]
Child: [r2215]