[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 8 Oct 2012 09:35:52 +0000 (11:35 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 8 Oct 2012 09:35:52 +0000 (11:35 +0200)
commit1b5c7111f6eac51a4b5a264d9b02fa0b1176a95c
treeff87bf912d849114d727ab74678cba662bf8a4f4
parent8fc09c1c7818613ef5d849bbd113df6e0a9d9b0e
parentfd9dfb51735d13d41b4bfd111aa48409f76040d3
[MERGE] from trunk

bzr revid: fva@openerp.com-20121008093552-nnf1ax5ueiotjtej