Merge svn revisions 978-979 from Zebra CVS.
3 files changed