Merge svn revision 981 from Zebra cvs.
9 files changed