Merge svn revisions 1208, 1222 and 1228 from Zebra cvs.
9 files changed