[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 12:14:47 +0000 (17:44 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 12:14:47 +0000 (17:44 +0530)
bzr revid: mra@mra-laptop-20101209121447-4fosmap0x3abp7b0

1  2 
addons/sale/sale.py

Simple merge