Merge svn revisions 1065 and 1066 from Zebra CVS.
6 files changed