[MERGE] opw 17657
authorRaphael Collet <rco@openerp.com>
Fri, 30 Sep 2011 15:04:46 +0000 (17:04 +0200)
committerRaphael Collet <rco@openerp.com>
Fri, 30 Sep 2011 15:04:46 +0000 (17:04 +0200)
commit5fc84965acc0f8fdf67a71298a0ed67590ebdd9b
tree4a4e259828e690607eb9c6726995fef3daaa2fbc
parentd0296cde59449df6de5340897ea8f2bcf893ae4f
parent1587b8f7313ab407f187efdb6edbde94904e0c2a
[MERGE] opw 17657

bzr revid: rco@openerp.com-20110930150446-itfna4xxxdlz5kw6