merged production branch into trunk
merged production branch into trunk


git-svn-id: 6ee5330382d635f8db534458b828bfb838aa37bc@2399 2a7d6d32-97f8-0310-8fd3-c67d3a265405

aleedom/pyShipping,aleedom/pyShipping