Merge svn revisions 997 and 1000 from Zebra cvs repository.
6 files changed