Merge to zebra.org CVS 20030203 16:30GMT
3 files changed