merge
authorFabien Pinckaers <fp@openerp.com>
Fri, 13 Jul 2012 20:34:34 +0000 (22:34 +0200)
committerFabien Pinckaers <fp@openerp.com>
Fri, 13 Jul 2012 20:34:34 +0000 (22:34 +0200)
commit06d6dfcf8a4bf3084f5d701597766b1eb0662e37
treec7eef60765bf1103c41d1bfaeaeccd2d772ff7f9
parent259dd3147dc7d418fe1ba84591df96fe7611c916
parentccde4ad6af8f63c329a6800cbd615da94e983340
merge

bzr revid: fp@openerp.com-20120713203434-p7z6u5qltl7dxe3f