Merged from GOBJECT1 to HEAD at 200106241

Original commit message from CVS:
Merged from GOBJECT1 to HEAD at 200106241
180 files changed