Merge svn revision 855 from Zebra repository.
4 files changed