Merge 'trunk' into 'current'

r52306@ika (orig r3602):  ilmari | 2007-07-25 08:20:17 -0500
Do not grow the whitespace after the DO NOT MODIFY THIS notice on each regen.
r52307@ika (orig r3603):  blblack | 2007-07-25 16:41:32 -0500
Changes update
r55683@ika (orig r3801):  blblack | 2007-10-04 09:02:50 -0500
0.04003 changes, version bumps