[MERGE] point_of_sale: hardware proxy reliability improvements
authorFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 13:29:42 +0000 (14:29 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 13:29:42 +0000 (14:29 +0100)
bzr revid: fva@openerp.com-20140127132942-sz8yj8frk59c5z6m


Trivial merge