Merge svn revision 975 from Zebra repository.
18 files changed