[MERGE] merge the branch of the point_of_sale
authorStephane Wirtel <stw@openerp.com>
Wed, 22 Aug 2012 09:32:23 +0000 (11:32 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 22 Aug 2012 09:32:23 +0000 (11:32 +0200)
commitd0057766ab10aa2d33f35a28c4e5b2dff739a419
tree5cbdb62c0ade10b37209ae78498d6f79e0ebbb50
parent5ff60ccd9ffa6080288de64f8ab8dc1009eedcc3
parent197e6731005960058ae8ca5f5d9ad839ed056516
[MERGE] merge the branch of the point_of_sale

bzr revid: stw@openerp.com-20120822093223-sdf72z5vhw2cejac