sync with upstream

Original commit message from CVS:
sync with upstream
2 files changed