Merge svn revision 954 from Zebra cvs.
1 file changed