[MERGE] opw 51169
authorJean-Christophe VASSORT <jcv@openerp.com>
Tue, 21 Feb 2012 16:39:18 +0000 (17:39 +0100)
committerJean-Christophe VASSORT <jcv@openerp.com>
Tue, 21 Feb 2012 16:39:18 +0000 (17:39 +0100)
commit4a7c18a31cb41eb8b1829159bab7b7ba4d9a0aaa
tree188c55f4e44f8b9a055df77313dec56c6b1dd8ff
parentd30b5cf577b78ebdc89da6f2f86b07e605d9b7b4
parent077ae99c1bb45be8ac4afa7212df872df0fd92e7
[MERGE] opw 51169

bzr revid: jcv@openerp.com-20120221163918-lk8xfaa00djaz3el