merge from release branch

Original commit message from CVS:
merge from release branch
12 files changed